[ci] Fix merge_release_pr script.

mapbox · Nov 13, 2023 · 616e44f · 616e44f
1 parent 4724ae0
commit 616e44f
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/.github/workflows/merge_release_pr.yml b/.github/workflows/merge_release_pr.yml
@@ -7,8 +7,8 @@ jobs:
   approve-release-pull-request:
     if: |
       (startsWith(github.head_ref, 'release-v') ||
-      startsWith(github.head_ref, 'release/v')) &&
-      startsWith(github.base_ref, 'main')
+      startsWith(github.head_ref, 'release/v') ||
+      startsWith(github.base_ref, 'main')) &&
       startsWith(github.event.pull_request.user.login, 'mapbox-github-ci-writer-public-') &&
       github.event.pull_request.user.id == '93400552'
     runs-on: ubuntu-latest
@@ -21,8 +21,8 @@ jobs:
   re-trigger-circleci-for-cocoapods:
     if: |
       (startsWith(github.head_ref, 'release-v') ||
-      startsWith(github.head_ref, 'release/v')) &&
-      startsWith(github.base_ref, 'main')
+      startsWith(github.head_ref, 'release/v') ||
+      startsWith(github.base_ref, 'main')) &&
       startsWith(github.event.pull_request.user.login, 'mapbox-github-ci-writer-public-') &&
       github.event.pull_request.user.id == '93400552'
     runs-on: ubuntu-latest