Merge branch 'hotfix/hugo-build'

.github/workflows/check-i18n.yml

@@ -3,11 +3,6 @@ name: hugo i18n check
 on:
   pull_request:
 
-# versions should be kept in sync with gh-pages and lighthouse-ci workflow
-env:
-  HUGO_VERSION: 0.119.0  # if you update this, change the README badge and lighthouse-ci.yml too!
-  NODE_VERSION: 18 # if you update this, change the README badge and lighthouse-ci.yml too!
-
 jobs:
   build-deploy:
     name: Check Hugo i18n translations
@@ -17,12 +12,18 @@ jobs:
     - name: checkout repository
       uses: actions/checkout@v3
 
+    - name: Get Hugo version
+      run: echo "HUGO_VERSION=$(cat .hugo_version)" >> $GITHUB_ENV
+
     - name: setup hugo
       uses: peaceiris/actions-hugo@v2
       with:
         hugo-version: ${{ env.HUGO_VERSION }}
         extended: true
 
+    - name: Get node version from package.json
+      run: echo "NODE_VERSION=$(cat package.json | jq -r '.volta.node')" >> $GITHUB_ENV
+
     - name: setup node.js
       uses: actions/setup-node@v2-beta
       with:

.github/workflows/gh-pages.yml

@@ -1,52 +1,92 @@
-name: github pages
+name: Deploy Hugo site to Pages
 
 on:
+  # Runs on pushes targeting the default branch
   push:
-    branches:
-    - main
+    branches: ["main"]
 
-# versions should be kept in sync with lighthouse-ci workflow
-env:
-  HUGO_VERSION: 0.119.0  # if you update this, change the README badge and lighthouse-ci.yml too!
-  NODE_VERSION: 18 # if you update this, change the README badge and lighthouse-ci.yml too!
+  # 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 one concurrent deployment
+concurrency:
+  group: "pages"
+  cancel-in-progress: true
+
+# Default to bash
+defaults:
+  run:
+    shell: bash
 
 jobs:
-  build-deploy:
-    name: build site and deploy to github pages
+  # Build job
+  build:
     runs-on: ubuntu-latest
+    steps:
+      - name: checkout repository
+        uses: actions/checkout@v3
+
+      - name: Get Hugo version
+        run: echo "HUGO_VERSION=$(cat .hugo_version)" >> $GITHUB_ENV
+
+      - name: setup hugo
+        uses: peaceiris/actions-hugo@v2
+        with:
+          hugo-version: ${{ env.HUGO_VERSION }}
+          extended: true
+
+      - name: Get node version from package.json
+        run: echo "NODE_VERSION=$(cat package.json | jq -r '.volta.node')" >> $GITHUB_ENV
 
+      - name: setup node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+
+      - name: fetch js dependencies from cache
+        uses: actions/cache@v3
+        with:
+          path: ~/.npm
+          key: npm-${{ hashFiles('package-lock.json') }}
+          restore-keys: |
+            npm-${{ hashFiles('package-lock.json') }}
+            npm-
+
+      - name: install js dependencies
+        run: npm ci
+
+      - name: Setup Pages
+        id: pages
+        uses: actions/configure-pages@v3
+
+      - name: Build with Hugo
+        env:
+          # For maximum backward compatibility with Hugo modules
+          HUGO_ENVIRONMENT: production
+          HUGO_ENV: production
+        run: |
+          hugo \
+            --minify \
+            --baseURL ${{ steps.pages.outputs.base_url }}
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v2
+        with:
+          path: ./public
+
+  # Deployment job
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    needs: build
     steps:
-    - name: checkout repository
-      uses: actions/checkout@v3
-
-    - name: setup hugo
-      uses: peaceiris/actions-hugo@v2
-      with:
-        hugo-version: ${{ env.HUGO_VERSION }}
-        extended: true
-
-    - name: setup node.js
-      uses: actions/setup-node@v3
-      with:
-        node-version: ${{ env.NODE_VERSION }}
-
-    - name: fetch js dependencies from cache
-      uses: actions/cache@v3
-      with:
-        path: ~/.npm
-        key: npm-${{ hashFiles('package-lock.json') }}
-        restore-keys: |
-          npm-${{ hashFiles('package-lock.json') }}
-          npm-
-
-    - name: install js dependencies
-      run: npm ci
-
-    - name: build site
-      run: hugo --minify
-
-    - name: deploy site to github pages
-      uses: peaceiris/actions-gh-pages@v3
-      with:
-        deploy_key: ${{ secrets.ACTIONS_DEPLOY_KEY }}
-        publish_dir: ./public
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v2

.github/workflows/lighthouse-ci.yml

@@ -2,10 +2,7 @@ name: lighthouse ci
 
 on: [push]
 
-# versions should be kept in sync with gh-pages workflow
 env:
-    HUGO_VERSION: 0.119.0  # if you update this, change the README badge and gh-pages.yml too!
-    NODE_VERSION: 18  # if you update this, change the README badge and gh-pages.yml too!
     LHCI_GITHUB_APP_TOKEN: ${{ secrets.LHCI_GITHUB_APP_TOKEN }}
 
 jobs:
@@ -17,12 +14,18 @@ jobs:
       - name: checkout repository
         uses: actions/checkout@v4
 
+      - name: Get Hugo version
+        run: echo "HUGO_VERSION=$(cat .hugo_version)" >> $GITHUB_ENV
+
       - name: setup hugo
         uses: peaceiris/actions-hugo@v2
         with:
           hugo-version: ${{ env.HUGO_VERSION }}
           extended: true
 
+      - name: Get node version from package.json
+        run: echo "NODE_VERSION=$(cat package.json | jq -r '.volta.node')" >> $GITHUB_ENV
+
       - name: setup node.js
         uses: actions/setup-node@v3
         with:

.hugo_version

@@ -0,0 +1 @@
+0.119.0

package.json

@@ -23,5 +23,8 @@
   "homepage": "https://startwords.cdh.princeton.edu/",
   "engines": {
     "node": ">=18"
+  },
+  "volta": {
+    "node": "18.18.0"
   }
 }