From 56024cc688540fe2915c38937508ee8ce2e002e6 Mon Sep 17 00:00:00 2001 From: kB01 Date: Thu, 11 Apr 2024 19:13:24 +0200 Subject: [PATCH 01/16] Added shell.nix --- shell.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 shell.nix diff --git a/shell.nix b/shell.nix new file mode 100644 index 0000000..0c62133 --- /dev/null +++ b/shell.nix @@ -0,0 +1,12 @@ +with import {}; + +stdenv.mkDerivation { + name = "node"; + buildInputs = [ + nodejs_21 + hugo + ]; + shellHook = '' + export PATH="$PWD/node_modules/.bin/:$PATH" + ''; +} \ No newline at end of file From 9d85a35f382cf602204a79dc00fa886f446a6f61 Mon Sep 17 00:00:00 2001 From: kB01 Date: Thu, 11 Apr 2024 19:38:49 +0200 Subject: [PATCH 02/16] Added Build Forgejo Actions --- .github/workflows/main.yml | 59 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000..79371b4 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,59 @@ +name: CI + +on: [push] + +jobs: + build: + env: + HUGO_VERSION: ${{ github.sha }} + TZ: Asia/Shanghai + runs-on: ubuntu-latest + + steps: + - name: Git checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + submodules: true + + - name: Set git config core.quotepath false # https://github.com/gohugoio/hugo/issues/9810#issuecomment-1107519804 + run: git config --global core.quotepath false + + - name: Use Node.js + uses: actions/setup-node@v4 + with: + node-version: '21.x' + + - name: Install Theme + run: cd themes/kb-one-de-theme && yarn install --production + + - name: Install PostCSS-CLI + run: npm install postcss-cli -g + + - name: Setup hugo + uses: peaceiris/actions-hugo@v2 + with: + hugo-version: '0.123.8' + extended: true + + - name: Build Hugo + run: echo "HUGO_VERSION -> $HUGO_VERSION" && hugo --gc --minify --cleanDestinationDir + + - name: Hugo-Encrypt + run: cd themes/kb-one-de-theme && node ./hugo-encrypt.js + + - name: Upload Artifacts + uses: actions/upload-artifact@v4 + with: + name: public + path: ./public + + - name: prerelease + if: ${{ false }} + uses: actions/forgejo-release@v1 + with: + direction: upload + url: https://git.kb-one.de/ + release-dir: ./public + release-notes: "Automatic built Pre-Release for $HUGO_VERSION" + prerelease: true \ No newline at end of file From 32926bdfe0d0f2f9008043f2df97fe76adbc25f2 Mon Sep 17 00:00:00 2001 From: kB01 Date: Thu, 11 Apr 2024 19:48:24 +0200 Subject: [PATCH 03/16] Actions: Upload Artifacts use Forgejos Fork --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 79371b4..d362b45 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -43,7 +43,7 @@ jobs: run: cd themes/kb-one-de-theme && node ./hugo-encrypt.js - name: Upload Artifacts - uses: actions/upload-artifact@v4 + uses: forgejo/upload-artifact@v4 with: name: public path: ./public From 6afa571ce9cb357e893a4f0595412989b8026f8e Mon Sep 17 00:00:00 2001 From: kB01 Date: Thu, 11 Apr 2024 19:52:39 +0200 Subject: [PATCH 04/16] Disabled Artifact Upload for now. --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d362b45..20cb9f1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -43,6 +43,7 @@ jobs: run: cd themes/kb-one-de-theme && node ./hugo-encrypt.js - name: Upload Artifacts + if: ${{ false }} uses: forgejo/upload-artifact@v4 with: name: public From 272fcc62565634eeace87a2e0d76fcfe99d7b7ab Mon Sep 17 00:00:00 2001 From: kB01 Date: Thu, 11 Apr 2024 19:53:41 +0200 Subject: [PATCH 05/16] Added Empty Key --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 20cb9f1..22256ff 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -48,6 +48,7 @@ jobs: with: name: public path: ./public + key: "" - name: prerelease if: ${{ false }} From 70c65a34d2268b748459da9eee2223bafe005982 Mon Sep 17 00:00:00 2001 From: kB01 Date: Thu, 11 Apr 2024 19:55:09 +0200 Subject: [PATCH 06/16] Changed Formatting --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 22256ff..9c0a518 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -45,10 +45,10 @@ jobs: - name: Upload Artifacts if: ${{ false }} uses: forgejo/upload-artifact@v4 + key: "" with: name: public - path: ./public - key: "" + path: ./public/ - name: prerelease if: ${{ false }} From 8acb971c62fb8679197ec3d8e862493074a64a49 Mon Sep 17 00:00:00 2001 From: kB01 Date: Thu, 11 Apr 2024 19:55:51 +0200 Subject: [PATCH 07/16] remover Artifact Upload --- .github/workflows/main.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9c0a518..dea7d13 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -42,14 +42,6 @@ jobs: - name: Hugo-Encrypt run: cd themes/kb-one-de-theme && node ./hugo-encrypt.js - - name: Upload Artifacts - if: ${{ false }} - uses: forgejo/upload-artifact@v4 - key: "" - with: - name: public - path: ./public/ - - name: prerelease if: ${{ false }} uses: actions/forgejo-release@v1 From f38764d3e529bbd87905d81e322aa46a9d8e45b2 Mon Sep 17 00:00:00 2001 From: kB01 Date: Thu, 11 Apr 2024 19:56:47 +0200 Subject: [PATCH 08/16] Removed Pre Release Action --- .github/workflows/main.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index dea7d13..e1d12bc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -42,12 +42,9 @@ jobs: - name: Hugo-Encrypt run: cd themes/kb-one-de-theme && node ./hugo-encrypt.js - - name: prerelease + - name: Upload Artifacts if: ${{ false }} - uses: actions/forgejo-release@v1 + uses: forgejo/upload-artifact@v4 with: - direction: upload - url: https://git.kb-one.de/ - release-dir: ./public - release-notes: "Automatic built Pre-Release for $HUGO_VERSION" - prerelease: true \ No newline at end of file + name: public + path: ./public/ From e31b8d92ac7fa318a91d90da0fad16c432b2d7b4 Mon Sep 17 00:00:00 2001 From: kB01 Date: Thu, 11 Apr 2024 20:00:19 +0200 Subject: [PATCH 09/16] Chaged Build to run on docker --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e1d12bc..0f41ead 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -7,7 +7,7 @@ jobs: env: HUGO_VERSION: ${{ github.sha }} TZ: Asia/Shanghai - runs-on: ubuntu-latest + runs-on: docker steps: - name: Git checkout From 63b76ce93e09f58f842d027003f49abce59df366 Mon Sep 17 00:00:00 2001 From: kB01 Date: Thu, 11 Apr 2024 20:04:45 +0200 Subject: [PATCH 10/16] Action Setup Hugo now points to Github Action; Re-Added Artifact Upload --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0f41ead..31d7cb0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -31,7 +31,7 @@ jobs: run: npm install postcss-cli -g - name: Setup hugo - uses: peaceiris/actions-hugo@v2 + uses: https://github.com/peaceiris/actions-hugo@v2 with: hugo-version: '0.123.8' extended: true @@ -43,7 +43,7 @@ jobs: run: cd themes/kb-one-de-theme && node ./hugo-encrypt.js - name: Upload Artifacts - if: ${{ false }} + if: ${{ true }} uses: forgejo/upload-artifact@v4 with: name: public From cc9e0bfb56f579ea0e4c8abd9b467faf8eff1fc1 Mon Sep 17 00:00:00 2001 From: kB01 Date: Thu, 11 Apr 2024 20:08:05 +0200 Subject: [PATCH 11/16] Changed Theme Submodule Path to https source --- .gitmodules | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitmodules b/.gitmodules index 71cd6c8..ed33d50 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,3 +2,5 @@ path = themes/kb-one-de-theme url = ssh://git@git.kb-one.de:9522/kb01/kb-one-de-theme.git branch = kb-one-edit +[submodule "themes/kb-one-de-theme/"] + url = https://git.kb-one.de/kb01/kb-one-de-theme From 44daeaa8c943e7aec95e0bb7151d1c676df69fe9 Mon Sep 17 00:00:00 2001 From: kB01 Date: Thu, 11 Apr 2024 20:17:06 +0200 Subject: [PATCH 12/16] Fixed Submodule URL --- .gitmodules | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index ed33d50..d378848 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,4 @@ [submodule "themes/kb-one-de-theme"] path = themes/kb-one-de-theme - url = ssh://git@git.kb-one.de:9522/kb01/kb-one-de-theme.git - branch = kb-one-edit -[submodule "themes/kb-one-de-theme/"] url = https://git.kb-one.de/kb01/kb-one-de-theme + branch = kb-one-edit From f4467cbace3b92a893a7be04692736b65d1a6c8f Mon Sep 17 00:00:00 2001 From: kB01 Date: Thu, 11 Apr 2024 20:19:33 +0200 Subject: [PATCH 13/16] Changed Upload Artifacts to exact URL of working Fork --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 31d7cb0..e3b37b1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -44,7 +44,7 @@ jobs: - name: Upload Artifacts if: ${{ true }} - uses: forgejo/upload-artifact@v4 + uses: https://code.forgejo.org/forgejo/upload-artifact with: name: public path: ./public/ From b464f0919bda41997023d7a02bda94d6ba4d4329 Mon Sep 17 00:00:00 2001 From: kB01 Date: Thu, 11 Apr 2024 20:20:39 +0200 Subject: [PATCH 14/16] fixed Typo in Explicit Action URL --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e3b37b1..b0c5d31 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -44,7 +44,7 @@ jobs: - name: Upload Artifacts if: ${{ true }} - uses: https://code.forgejo.org/forgejo/upload-artifact + uses: https://code.forgejo.org/forgejo/upload-artifact@v4 with: name: public path: ./public/ From a229db11daac2a6e1c3c8381ccf73a906299fd49 Mon Sep 17 00:00:00 2001 From: kb01 Date: Sat, 13 Apr 2024 20:50:52 +0200 Subject: [PATCH 15/16] changed artifact upload to same AS in the example --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b0c5d31..21d4fa9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -44,7 +44,7 @@ jobs: - name: Upload Artifacts if: ${{ true }} - uses: https://code.forgejo.org/forgejo/upload-artifact@v4 + uses: actions/upload-artifact@vv3 with: name: public path: ./public/ From 71957ef182c9eae2ef6cc498ef5b789caa6820d8 Mon Sep 17 00:00:00 2001 From: kb01 Date: Sat, 13 Apr 2024 20:57:43 +0200 Subject: [PATCH 16/16] fixed typo --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 21d4fa9..93ab6db 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -44,7 +44,7 @@ jobs: - name: Upload Artifacts if: ${{ true }} - uses: actions/upload-artifact@vv3 + uses: actions/upload-artifact@v3 with: name: public path: ./public/