Merge remote-tracking branch 'upstream/development' into development

ubiquity · Jun 17, 2024 · 1036301 · 1036301
2 parents c001faa + 2b41bcc
commit 1036301
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 15 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,4 +1,4 @@
-name: Build & Deploy
+name: Build
 
 on:
   push:
@@ -15,8 +15,6 @@ jobs:
     steps:
       - name: Check out repository
         uses: actions/checkout@v4
-        # with:
-        # submodules: "recursive" # Ensures submodules are checked out
 
       - name: Set up Node.js
         uses: actions/setup-node@v4
@@ -27,16 +25,9 @@ jobs:
         run: |
           yarn
           yarn build
-        # env: # Set environment variables for the build
-        # SUPABASE_URL: "https://wfzpewmlyiozupulbuur.supabase.co"
-        # SUPABASE_ANON_KEY: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6IndmenBld21seWlvenVwdWxidXVyIiwicm9sZSI6ImFub24iLCJpYXQiOjE2OTU2NzQzMzksImV4cCI6MjAxMTI1MDMzOX0.SKIL3Q0NOBaMehH0ekFspwgcu3afp3Dl9EDzPqs1nKs"
 
-      - name: Deploy to Cloudflare
-        uses: ubiquity/cloudflare-deploy-action@main
+      - name: Upload build artifact
+        uses: actions/upload-artifact@v4
         with:
-          repository: ${{ github.repository }}
-          production_branch: ${{ github.event.repository.default_branch }}
-          output_directory: "static"
-          current_branch: ${{ github.ref_name }}
-          pull_request_number: ${{ github.event.pull_request.number }}
-          commit_sha: ${{ github.event.pull_request.head.sha }}
+          name: static
+          path: static
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -0,0 +1,26 @@
+name: Deploy to Cloudflare Pages
+
+on:
+  workflow_run:
+    workflows: ["Build"]
+    types:
+      - completed
+
+jobs:
+  deploy-to-cloudflare:
+    name: Automatic Cloudflare Deploy
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Deploy to Cloudflare
+        if: ${{ github.event.workflow_run.conclusion == 'success' }}
+        uses: ubiquity/cloudflare-deploy-action@main
+        with:
+          repository: ${{ github.repository }}
+          production_branch: ${{ github.event.repository.default_branch }}
+          build_artifact_name: "static"
+          output_directory: "static"
+          current_branch: ${{ github.event.workflow_run.head_branch }}
+          cloudflare_account_id: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+          cloudflare_api_token: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+          commit_sha: ${{ github.event.workflow_run.head_sha }}
+          workflow_run_id: ${{ github.event.workflow_run.id }}
diff --git a/static/index.html b/static/index.html
@@ -64,7 +64,7 @@ <h1>Putting the 'A' In 'DAO'</h1>
             </header>
             <ol>
               <li>
-                <a title="More Info" target="_blank" rel="noopener noreferrer" href="https://dao.ubq.fi/devpool">
+                <a title="More Info" target="_blank" rel="noopener noreferrer" href="https://dao.ubq.fi/the-devpool">
                   <span>
                     <svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24">
                       <path