Updated deploy script

.github/workflows/build_deploy_master.yml

@@ -1,46 +1,89 @@
-name: Build & Deploy to Pages
+name: Deploy TLSnotary landing page to GitHub Pages
 
 on:
+  # Runs on pushes targeting the default branch
   push:
-    branches: [master]
+    branches: [$default-branch]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
+# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
+
 jobs:
-  build-and-deploy:
+  # Build job
+  build:
     runs-on: ubuntu-latest
-
     steps:
-      - name: Checkout 🛒
+      - name: Checkout
         uses: actions/checkout@v4
-
+      - name: Detect package manager
-      - name: Setup Node.js ⚙️ - Cache dependencies ⚡ - Install dependencies 🔧
+        id: detect-package-manager
-        uses: ./.github/workflows/setup-node
+        run: |
-
+          if [ -f "${{ github.workspace }}/yarn.lock" ]; then
-      - name: Setup Pages ⚙️
+            echo "manager=yarn" >> $GITHUB_OUTPUT
-        uses: actions/configure-pages@v4
+            echo "command=install" >> $GITHUB_OUTPUT
+            echo "runner=yarn" >> $GITHUB_OUTPUT
+            exit 0
+          elif [ -f "${{ github.workspace }}/package.json" ]; then
+            echo "manager=npm" >> $GITHUB_OUTPUT
+            echo "command=ci" >> $GITHUB_OUTPUT
+            echo "runner=npx --no-install" >> $GITHUB_OUTPUT
+            exit 0
+          else
+            echo "Unable to determine package manager"
+            exit 1
+          fi
+      - name: Setup Node
+        uses: actions/setup-node@v4
         with:
+          node-version: "20"
+          cache: ${{ steps.detect-package-manager.outputs.manager }}
+      - name: Setup Pages
+        uses: actions/configure-pages@v5
+        with:
+          # Automatically inject basePath in your Next.js configuration file and disable
+          # server side image optimization (https://nextjs.org/docs/api-reference/next/image#unoptimized).
+          #
+          # You may remove this line if you want to manage the configuration yourself.
           static_site_generator: next
-
+      - name: Restore cache
-      # - name: Push to Web3.storage
+        uses: actions/cache@v4
-      #   uses: web3-storage/add-to-web3@v2
+        with:
-      #   id: web3
+          path: |
-      #   with:
+            .next/cache
-      #     web3_token: ${{ secrets.WEB3_STORAGE_TOKEN }}
+          # Generate a new cache whenever packages or source files change.
-      #     path_to_add: 'build'
+          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.
-      # - run: echo ${{ steps.web3.outputs.cid }}
+          restore-keys: |
-      # - run: echo ${{ steps.web3.outputs.url }}
+            ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json', '**/yarn.lock') }}-
-
+      - name: Install dependencies
-      - name: Build with Next.js 🏗️
+        run: ${{ steps.detect-package-manager.outputs.manager }} ${{ steps.detect-package-manager.outputs.command }}
-        run: npx next build
+      - name: Build with Next.js
-
+        run: ${{ steps.detect-package-manager.outputs.runner }} next build
-      - name: Upload artifact 📡
+      - name: Upload artifact
         uses: actions/upload-pages-artifact@v3
         with:
-          path: out
+          path: ./out
-
-      - name: Publish to GitHub Pages 🚀
-        uses: actions/deploy-pages@v4
 
+  # Deployment job
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4

.github/workflows/build_dev.yml

@@ -1,34 +0,0 @@
-name: Build Dev
-
-on:
-  push:
-    branches: [dev]
-  pull_request:
-    branches: [dev]
-
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
-
-jobs:
-  build-and-deploy-dev:
-    permissions:
-      contents: write
-    concurrency:
-      group: ${{ github.workflow }}-${{ github.ref }}
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout 🛒
-        uses: actions/checkout@v4
-
-      - name: Setup Node.js ⚙️ - Cache dependencies ⚡ - Install dependencies 🔧
-        uses: ./.github/workflows/setup-node
-
-      - name: Setup Pages ⚙️
-        uses: actions/configure-pages@v4
-        with:
-          static_site_generator: next
-
-      - name: Build with Next.js 🏗️
-        run: npx next build
-

.github/workflows/setup-node/action.yml

@@ -1,21 +0,0 @@
-name: setup-node
-description: "Setup Node.js ⚙️ - Cache dependencies ⚡ - Install dependencies 🔧"
-runs:
-  using: "composite"
-  steps:
-    - name: Setup Node.js ⚙️
-      uses: actions/setup-node@v4
-      with:
-        node-version: 20
-
-    - name: Cache dependencies ⚡
-      id: cache_dependencies
-      uses: actions/cache@v3
-      with:
-        path: node_modules
-        key: node-modules-${{ hashFiles('package-lock.json') }}
-
-    - name: Install dependencies 🔧
-      shell: bash
-      if: steps.cache_dependencies.outputs.cache-hit != 'true'
-      run: npm ci