Merge 7c95a5e7eb into c79e07e2a6

.github/workflows/docs-master.yml

@@ -4,18 +4,19 @@ on:
   push:
     branches:
       - master
-  workflow_dispatch:
 
 permissions:
-  contents: write
+  contents: read
+  pages: write
+  id-token: write
 
 concurrency:
   group: pages-production
   cancel-in-progress: true
 
 jobs:
-  build-and-deploy:
-    name: Build and deploy docs
+  build:
+    name: Build docs
     runs-on: ubuntu-latest
 
     steps:
@@ -34,11 +35,21 @@ jobs:
       - name: Build docs site
         run: npm run publish
 
-      - name: Deploy production docs to gh-pages root
-        uses: peaceiris/actions-gh-pages@v4
+      # upload the built docs as the GitHub Pages artifact
+      - name: Upload artifact for GitHub Pages
+        uses: actions/upload-pages-artifact@v3
         with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_branch: gh-pages
-          publish_dir: ./docs
-          keep_files: true
-          cname: keyrune.andrewgioia.com
+          path: ./docs
+
+  deploy:
+    name: Deploy to GitHub Pages
+    needs: build
+    runs-on: ubuntu-latest
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+
+    steps:
+      - name: Deploy
+        id: deployment
+        uses: actions/deploy-pages@v4