Merge pull request #7 from sciencefidelity/ci/test-7

sciencefidelity · Aug 21, 2023 · 9e9ab4f · 9e9ab4f
2 parents a892edf + bdea3fb
commit 9e9ab4f
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -37,14 +37,14 @@ jobs:
 
       - name: test 2
         run: |
-          echo ${{ (github.event.pull_request.merged != false && github.head_ref == 'main') && 'production' || 'staging' }}
-          echo ${{ (github.event.pull_request.merged != false && github.head_ref == 'main') && '' || '--tag beta' }}
+          echo ${{ (github.event.pull_request.merged == true && github.ref_name == 'main') && 'production' || 'staging' }}
+          echo ${{ (github.event.pull_request.merged == true && github.ref_name == 'main') && '' || '--tag beta' }}
 
       - name: test 3
         run: |
           echo ${{ env.MATT_ENV }}
           echo ${{ env.PACKAGE_TAG }}
           echo ${{ env.GITHUB_BRANCH }}
         env:
-          MATT_ENV: ${{ (github.event.pull_request.merged != false && env.GITHUB_BRANCH == 'main') && 'production' || 'staging' }}
-          PACKAGE_TAG: ${{ (github.event.pull_request.merged != false && env.GITHUB_BRANCH == 'main') && '' || '--tag beta' }}
+          MATT_ENV: ${{ (github.event.pull_request.merged == true && github.ref_name == 'main') && 'production' || 'staging' }}
+          PACKAGE_TAG: ${{ (github.event.pull_request.merged == true && github.ref_name == 'main') && '' || '--tag beta' }}