From 50b43eef33d0722fb10b860231cb489717413e11 Mon Sep 17 00:00:00 2001 From: DANIEL KATOTO Date: Sun, 20 Sep 2026 16:51:26 +0300 Subject: [PATCH 1/2] Fix deploy workflow Signed-off-by: DANIEL KATOTO --- .github/workflows/build-and-deploy-site.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-and-deploy-site.yml b/.github/workflows/build-and-deploy-site.yml index cad22230..981e3fdd 100644 --- a/.github/workflows/build-and-deploy-site.yml +++ b/.github/workflows/build-and-deploy-site.yml @@ -8,7 +8,10 @@ on: - 'Makefile' - 'CNAME' - '.github/workflows/build-and-deploy-site.yml' - - '.github/workflows/build-and-preview-site.yml' + +concurrency: + group: "pages-deployment" + cancel-in-progress: true permissions: contents: write @@ -22,12 +25,12 @@ jobs: runs-on: ubuntu-24.04 steps: - name: Checkout site source - uses: actions/checkout@v6 + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 #v7.0.1 - name: Setup Node uses: actions/setup-node@v4 with: - node-version: "20" + node-version: "22" cache: "npm" cache-dependency-path: site/package-lock.json @@ -43,5 +46,4 @@ jobs: with: github_token: ${{ secrets.GITHUB_TOKEN }} publish_branch: gh-pages - publish_dir: ./site/build - keep_files: true + publish_dir: ./site/build \ No newline at end of file From 6b6e4f1bfeba4dc2ada82b2b1f1dbca28d2c1df3 Mon Sep 17 00:00:00 2001 From: DANIEL KATOTO Date: Sun, 20 Sep 2026 17:40:22 +0300 Subject: [PATCH 2/2] Fix deploy workflow Signed-off-by: DANIEL KATOTO --- .github/workflows/build-and-deploy-site.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build-and-deploy-site.yml b/.github/workflows/build-and-deploy-site.yml index 981e3fdd..c89a43ba 100644 --- a/.github/workflows/build-and-deploy-site.yml +++ b/.github/workflows/build-and-deploy-site.yml @@ -9,10 +9,6 @@ on: - 'CNAME' - '.github/workflows/build-and-deploy-site.yml' -concurrency: - group: "pages-deployment" - cancel-in-progress: true - permissions: contents: write @@ -41,9 +37,12 @@ jobs: cp CNAME site/build/CNAME touch site/build/.nojekyll - - name: Deploy site - uses: peaceiris/actions-gh-pages@v4 + - name: Deploy to GitHub Pages + uses: JamesIves/github-pages-deploy-action@d92aa235d04922e8f08b40ce78cc5442fcfbfa2f #v4.8.0 with: - github_token: ${{ secrets.GITHUB_TOKEN }} - publish_branch: gh-pages - publish_dir: ./site/build \ No newline at end of file + folder: ./site/build + branch: gh-pages + clean: true + clean-exclude: | + pr-preview + force: false \ No newline at end of file