Merge branch 'main' into 10yearevent-blogpost

Author: erikvansebille

.github/workflows/deploy.yml

@@ -5,6 +5,7 @@ on:
     branches: [main]
   pull_request:
     branches: [main]
+  workflow_dispatch:
 
 # Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
 permissions:
@@ -14,7 +15,7 @@ permissions:
 
 # Allow only one concurrent deployment
 concurrency:
-  group: 'pages'
+  group: branch-${{ github.head_ref }}
   cancel-in-progress: true
 
 jobs:
@@ -29,7 +30,16 @@ jobs:
         with:
           node-version: '20'
           cache: 'npm'
-
+      - name: Restore cache
+        uses: actions/cache@v4
+        with:
+          path: |
+            .next/cache
+          # Generate a new cache whenever packages or source files change.
+          key: ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json', '**/yarn.lock') }}-${{ hashFiles('**.[jt]s', '**.[jt]sx') }}
+          # If source files changed but packages didn't, rebuild from a prior cache.
+          restore-keys: |
+            ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json', '**/yarn.lock') }}-
       - name: Install dependencies
         run: npm ci
 

.github/workflows/linkcheck.yml

@@ -18,7 +18,7 @@ jobs:
       LYCHEE_REPORT_FILE: ./lychee/out.md
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Link Checker
         id: lychee
@@ -56,7 +56,7 @@ jobs:
           update-mode: 'replace'
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: lychee-report
           path: ${{ env.LYCHEE_REPORT_FILE }}

public/CNAME CNAMEpublic/CNAME renamed to CNAME

@@ -18,9 +18,7 @@ const nextConfig = {
   images: {
     domains: ["raw.githubusercontent.com", "numpy.org", "dask.org", "chainer.org"],
   },
-  output: 'export',
-  basePath: process.env.NODE_ENV === 'production' ? '/oceanparcels_website' : '',
-  assetPrefix: process.env.NODE_ENV === 'production' ? '/oceanparcels_website/' : '',
+  output: 'export'
 }
 
 export default withMDX(nextConfig)