ci: fix condition

trailheadapps · Jul 26, 2023 · 5d44904 · 5d44904
1 parent 23417b0
commit 5d44904
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/.github/workflows/ci-pr.yml b/.github/workflows/ci-pr.yml
@@ -4,13 +4,18 @@ name: CI on PR
 # Definition when the workflow should run
 on:
     workflow_dispatch:
+        inputs:
+            prerelease:
+                description: 'Run on a prerelease org?'
+                required: false
+                type: boolean
     pull_request:
         types: [opened, edited, synchronize, reopened]
 
 # Workflow environment variables
 env:
     # Is the PR base branch a prerelease branch
-    IS_PRERELEASE_BRANCH: ${{ startsWith(github.event.pull_request.base.ref, 'prerelease/') }}
+    IS_PRERELEASE: ${{ startsWith(github.event.pull_request.base.ref, 'prerelease/') || inputs.prerelease }}
 
 # Jobs to be executed
 jobs:
@@ -158,12 +163,12 @@ jobs:
 
             # Create prerelease scratch org
             - name: 'Create prerelease scratch org'
-              if: env.IS_PRERELEASE_BRANCH
+              if: env.IS_PRERELEASE
               run: sf org create scratch -f config/project-scratch-def.json -a scratch-org -d -y 1 --release=preview
 
             # Create scratch org
             - name: 'Create scratch org'
-              if: !env.IS_PRERELEASE_BRANCH
+              if: !env.IS_PRERELEASE
               run: sf org create scratch -f config/project-scratch-def.json -a scratch-org -d -y 1
 
             # Deploy source to scratch org
@@ -221,4 +226,4 @@ jobs:
               with:
                   token: ${{ secrets.BOT_ACCESS_TOKEN }}
                   event-type: start-packaging-pr
-                  client-payload: '{ "ref": "${{ github.ref }}", "sha": "${{ github.sha }}", "isPrelease": "${{ env.IS_PRERELEASE_BRANCH }}" }'
+                  client-payload: '{ "ref": "${{ github.ref }}", "sha": "${{ github.sha }}", "isPrelease": "${{ env.IS_PRERELEASE }}" }'