Merge bff9f61089 into df0e7ff45f

.github/workflows/pr.yml

@@ -7,20 +7,22 @@ on:
       - master
 
 permissions:
-  contents: write         # push to gh-pages
+  contents: read
-  pull-requests: write    # create/update PR comment
+  pages: write
+  id-token: write
+  pull-requests: write
 
 concurrency:
   group: docs-preview-${{ github.event.pull_request.number }}
   cancel-in-progress: true
 
 jobs:
-  build-and-deploy-preview:
+  build:
-    name: Build & deploy PR preview
+    name: Build docs
     runs-on: ubuntu-latest
 
     steps:
-      - name: Checkout PR branch
+      - name: Checkout repository
         uses: actions/checkout@v4
 
       - name: Setup Node
@@ -32,24 +34,41 @@ jobs:
       - name: Install dependencies
         run: npm ci
 
-      - name: Build docs
+      - name: Build docs (npm run publish)
         run: npm run publish
 
-      - name: Deploy preview to gh-pages/pr-<number>/
+      - name: Upload artifact for GitHub Pages
-        uses: peaceiris/actions-gh-pages@v4
+        uses: actions/upload-pages-artifact@v3
         with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
+          path: ./docs
-          publish_branch: gh-pages
+
-          publish_dir: ./docs
+  deploy:
-          destination_dir: pr-${{ github.event.pull_request.number }}
+    name: Deploy PR preview
-          keep_files: true
+    needs: build
+    runs-on: ubuntu-latest
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+
+    outputs:
+      page_url: ${{ steps.deployment.outputs.page_url }}
+
+    steps:
+      - name: Deploy to GitHub Pages (preview)
+        id: deployment
+        uses: actions/deploy-pages@v4
+        with:
+          # mark this as a preview deployment for a PR
+          preview: true
 
   comment:
     name: Comment preview URL on PR
-    needs: build-and-deploy-preview
+    needs: deploy
     runs-on: ubuntu-latest
-    # only for same-repo PRs (no forks)
+    # only run if we actually got a URL, and only for same-repo PRs (forks have restricted tokens)
-    if: github.event.pull_request.head.repo.full_name == github.repository
+    if: >
+      needs.deploy.outputs.page_url != '' &&
+      github.event.pull_request.head.repo.full_name == github.repository
 
     steps:
       - name: Find existing docs preview comment
@@ -68,7 +87,7 @@ jobs:
           body: |
             🔍 **Keyrune docs preview**
 
-            Preview URL: https://keyrune.andrewgioia.com/pr-${{ github.event.pull_request.number }}/
+            Preview URL: ${{ needs.deploy.outputs.page_url }}
 
             - Source branch: `${{ github.head_ref }}`
             - Target branch: `${{ github.base_ref }}`

docs/icons.html

@@ -45,7 +45,7 @@
         <div class="wrapper">
             <section>
                 <h3>
-                    View the full list of set and expansion symbols below, for all sets and special edition products up to <strong>Lorwyn Eclipsed and TMNT</strong>. To use the symbols on your desktop or just get the vectors, check out the <a href="cheatsheet.html">Cheatsheet</a>.
+                    View the full list of set and expansion symbols below, for all sets and special edition products up to <strong>Avatar: the Last Airbender</strong>. To use the symbols on your desktop or just get the vectors, check out the <a href="cheatsheet.html">Cheatsheet</a>.
                 </h3>
                 <p style="margin: -15px 0 25px;">
                     <strong>Note:</strong> you can now link directly to a preview of each symbol's by adding the symbol code at the end of the url like this: <a href="https://keyrune.andrewgioia.com/icons.html?icon=ody">https://keyrune.andrewgioia.com/icons.html?icon=ody</a>.

docs/index.html

@@ -43,7 +43,7 @@
                 </a>
             </div>
             <p>
-                Current version 3.18.0 includes all sets to Lorwyn Eclipsed.
+                Current version 3.17.1 includes all sets to Avatar: The Last Airbender.
             </p>
         </div>
     </header>