From 266dfd2afc7caa17a5fda59751bce09e9402e62e Mon Sep 17 00:00:00 2001 From: Mark Cafaro Date: Fri, 20 Jun 2025 13:50:51 -0400 Subject: [PATCH 1/4] Offer a preview of the site on PR --- .github/workflows/deploy.yml | 9 +++++---- .github/workflows/test.yml | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index c6ebf4d..7c4277c 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -1,9 +1,6 @@ name: Deploy -on: - push: - branches: [main] - workflow_dispatch: {} +on: [pull_request, workflow_dispatch] # Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages permissions: @@ -20,6 +17,8 @@ concurrency: jobs: deploy: runs-on: ubuntu-latest + env: + PREVIEW: ${{ github.ref != 'refs/heads/main' }} steps: - name: Checkout uses: actions/checkout@v4 @@ -32,3 +31,5 @@ jobs: - name: Deploy to GitHub Pages id: deployment uses: actions/deploy-pages@v4 + with: + preview: ${{ env.PREVIEW }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bd88693..5c4eaf0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,6 +1,6 @@ name: Test -on: [push, workflow_dispatch] +on: [pull_request, workflow_dispatch] jobs: test: From 91ccdaacd23cdffd5027450e679c6a84795ec2a0 Mon Sep 17 00:00:00 2001 From: Mark Cafaro Date: Fri, 20 Jun 2025 13:55:37 -0400 Subject: [PATCH 2/4] Add URL info to job --- .github/workflows/deploy.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 7c4277c..5f34a39 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -19,6 +19,9 @@ jobs: runs-on: ubuntu-latest env: PREVIEW: ${{ github.ref != 'refs/heads/main' }} + environment: + name: github-pages + url: ${{ steps.deployment.outputs.page_url }} steps: - name: Checkout uses: actions/checkout@v4 From 282f33b835c57550fb41520bfd80f58b30c72815 Mon Sep 17 00:00:00 2001 From: Mark Cafaro Date: Fri, 20 Jun 2025 14:02:55 -0400 Subject: [PATCH 3/4] Trigger --- .github/workflows/deploy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 5f34a39..0c9cfbc 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -22,6 +22,7 @@ jobs: environment: name: github-pages url: ${{ steps.deployment.outputs.page_url }} + steps: - name: Checkout uses: actions/checkout@v4 From 2e7345786ae5f67542ff5feac2a2c25ac65a0dda Mon Sep 17 00:00:00 2001 From: Mark Cafaro Date: Fri, 20 Jun 2025 14:10:38 -0400 Subject: [PATCH 4/4] Try different evironment name --- .github/workflows/deploy.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 0c9cfbc..ba0034f 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -17,12 +17,9 @@ concurrency: jobs: deploy: runs-on: ubuntu-latest - env: - PREVIEW: ${{ github.ref != 'refs/heads/main' }} environment: - name: github-pages + name: ${{ github.ref == 'refs/heads/main' && 'github-pages' || 'github-pages-preview' }} url: ${{ steps.deployment.outputs.page_url }} - steps: - name: Checkout uses: actions/checkout@v4 @@ -36,4 +33,4 @@ jobs: id: deployment uses: actions/deploy-pages@v4 with: - preview: ${{ env.PREVIEW }} + preview: ${{ github.ref != 'refs/heads/main' }}