From 616e44ffc575a9adee83e35fc33158d80b2dca69 Mon Sep 17 00:00:00 2001 From: Tatiana Ian Date: Mon, 13 Nov 2023 12:19:37 +0200 Subject: [PATCH] [ci] Fix merge_release_pr script. --- .github/workflows/merge_release_pr.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/merge_release_pr.yml b/.github/workflows/merge_release_pr.yml index 42596f1..317581b 100644 --- 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