From b3e846be12ce3bac1fff49b5eea1d7d769abc616 Mon Sep 17 00:00:00 2001
From: Sk3pper <13051136+Sk3pper@users.noreply.github.com>
Date: Fri, 9 Aug 2024 17:41:27 +0200
Subject: [PATCH] Edit workflow

---
 .github/workflows/deploy-site.yaml | 113 +++++++++++++++++++----------
 1 file changed, 73 insertions(+), 40 deletions(-)

diff --git a/.github/workflows/deploy-site.yaml b/.github/workflows/deploy-site.yaml
index 96ca508..2e7445e 100644
--- a/.github/workflows/deploy-site.yaml
+++ b/.github/workflows/deploy-site.yaml
@@ -1,46 +1,79 @@
-name: Deploy to Github Pages
-# run when a commit is pushed to "source" branch
+# Sample workflow for building and deploying a Hugo site to GitHub Pages
+name: Deploy Hugo site to Pages
+
 on:
-    push:
-      branches:
+  # Runs on pushes targeting the default branch
+  push:
+    branches:
       - main
-  
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
+# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
+
+# Default to bash
+defaults:
+  run:
+    shell: bash
+
 jobs:
-    deploy-to-gh-pages:
-      permissions:
-        contents: write
-
-      runs-on: ubuntu-latest
-      steps:
-      # checkout to the commit that has been pushed
-      - uses: actions/checkout@v4
-  
-      - name: Setup Hugo
-        uses: peaceiris/actions-hugo@v3.0.0
-        with:
-          hugo-version: 'latest'
-          extended: true
-  
-      - name: Update Hugo Modules
-        run: hugo mod tidy
-  
-      - name: Setup Node
-        uses: actions/setup-node@v4
+  # Build job
+  build:
+    runs-on: ubuntu-latest
+    env:
+      HUGO_VERSION: 0.128.0
+    steps:
+      - name: Install Hugo CLI
+        run: |
+          wget -O ${{ runner.temp }}/hugo.deb https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_linux-amd64.deb \
+          && sudo dpkg -i ${{ runner.temp }}/hugo.deb          
+      - name: Install Dart Sass
+        run: sudo snap install dart-sass
+      - name: Checkout
+        uses: actions/checkout@v4
         with:
-          node-version: 18
-  
-      - name: Install node modules
+          submodules: recursive
+          fetch-depth: 0
+      - name: Setup Pages
+        id: pages
+        uses: actions/configure-pages@v5
+      - name: Install Node.js dependencies
+        run: "[[ -f package-lock.json || -f npm-shrinkwrap.json ]] && npm ci || true"
+      - name: Build with Hugo
+        env:
+          HUGO_CACHEDIR: ${{ runner.temp }}/hugo_cache
+          HUGO_ENVIRONMENT: production
+          TZ: America/Los_Angeles
         run: |
-          hugo mod npm pack
-          npm install
-  
-      - name: Build
-        run: hugo --minify
-  
-      # push the generated content into the `gh-pages` branch.
-      - name: Deploy
-        uses: peaceiris/actions-gh-pages@v4.0.0
+          hugo \
+            --gc \
+            --minify \
+            --baseURL "${{ steps.pages.outputs.base_url }}/"          
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v3
         with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_branch: gh-pages
-          publish_dir: ./public
\ No newline at end of file
+          path: ./public
+
+  # Deployment job
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4
+