From f626285cb4f77ee63e6f3142c5d8f782a0830c6d Mon Sep 17 00:00:00 2001
From: Evan Pratten <ewpratten@gmail.com>
Date: Sun, 18 Dec 2022 12:20:20 -0500
Subject: [PATCH] Use GitHub's own pages deploy action

---
 .github/workflows/build.yml  | 11 ++++++++---
 .github/workflows/deploy.yml | 38 +++++++++++++++++++++++-------------
 2 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d05f658..69dc7fc 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -38,8 +38,13 @@ jobs:
       - name: Delete dist gitignore
         run: sudo rm -f ./public/dist/.gitignore
 
-      - name: Publish site as artifact
-        uses: actions/upload-artifact@v2
+      # - name: Publish site as artifact
+      #   uses: actions/upload-artifact@v2
+      #   with:
+      #     name: website-static-bundle
+      #     path: ./public
+
+      - name: Upload site as artifact
+        uses: actions/upload-pages-artifact@v1
         with:
-          name: website-static-bundle
           path: ./public
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index e20a9a6..78125ab 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -11,19 +11,29 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     needs: build
+    permissions:
+      pages: write
+      id-token: write
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
     steps:
-      - name: Download bundle artifact
-        uses: actions/download-artifact@v2
-        with:
-          name: website-static-bundle
-          path: ./public
-
       - name: Deploy to GitHub Pages
-        if: success()
-        uses: crazy-max/ghaction-github-pages@v2
-        with:
-          target_branch: gh-pages
-          build_dir: public
-          fqdn: ewpratten.com
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        id: deployment
+        uses: actions/deploy-pages@v1
+
+      # - name: Download bundle artifact
+      #   uses: actions/download-artifact@v2
+      #   with:
+      #     name: website-static-bundle
+      #     path: ./public
+
+      # - name: Deploy to GitHub Pages
+      #   if: success()
+      #   uses: crazy-max/ghaction-github-pages@v2
+      #   with:
+      #     target_branch: gh-pages
+      #     build_dir: public
+      #     fqdn: ewpratten.com
+      #   env:
+      #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}