From 41349321ee0f5c7742e9e9146f12429012568de5 Mon Sep 17 00:00:00 2001
From: Marko Korhonen <marko@korhonen.cc>
Date: Sat, 24 Feb 2024 22:48:10 +0200
Subject: [PATCH] Unify github and forgejo workflows

---
 .forgejo/workflows/deploy_site.yaml           |  2 +-
 .../workflows/{main.yml => deploy_site.yaml}  | 44 ++++++++++---------
 2 files changed, 25 insertions(+), 21 deletions(-)
 rename .github/workflows/{main.yml => deploy_site.yaml} (59%)

diff --git a/.forgejo/workflows/deploy_site.yaml b/.forgejo/workflows/deploy_site.yaml
index 8d99758..cd216dc 100644
--- a/.forgejo/workflows/deploy_site.yaml
+++ b/.forgejo/workflows/deploy_site.yaml
@@ -9,7 +9,7 @@ jobs:
     container:
       image: git.korhonen.cc/functionalhacker/hugo-asciidoc-docker-ci:latest
       volumes:
-        - caddy_korhonen_cc:/korhonen.cc
+        - caddy_korhonen_cc:/public
     steps:
       - name: Checkout
         uses: https://github.com/actions/checkout@v4
diff --git a/.github/workflows/main.yml b/.github/workflows/deploy_site.yaml
similarity index 59%
rename from .github/workflows/main.yml
rename to .github/workflows/deploy_site.yaml
index b4eb479..41297ab 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/deploy_site.yaml
@@ -1,33 +1,37 @@
-name: Hugo
+name: Build and deploy site
 on: [push]
+env:
+  GOROOT: /usr/local/lib/go
 permissions:
   contents: read
   pages: write
   id-token: write
 jobs:
   build:
+    name: Build site
     runs-on: ubuntu-latest
     container: 
       image: docker://git.korhonen.cc/functionalhacker/hugo-asciidoc-docker-ci:latest
-      volumes:
-        - './public:/public'
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - run: npm install
-      - run: hugo --gc --minify -d /public
-
-  deploy:
-    runs-on: ubuntu-latest
-    needs: build
-    steps:
-      - name: Upload artifact
-        uses: actions/upload-pages-artifact@v2
-        with:
-          path: './public'
-      - name: Deploy to GitHub Pages
-        id: deployment
-        uses: actions/deploy-pages@v2
     environment:
       name: github-pages
       url: ${{ steps.deployment.outputs.page_url }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Install NPM packages
+        run: npm install
+      - name: Run Hugo
+        run: hugo --gc --minify -d /public
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v3
+        with:
+          path: /public
+
+  deploy: 
+    name: Deploy site to github pages
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4