From 69a9b7de63b2e3d71b40ee9b17d4c6770e6fe72e Mon Sep 17 00:00:00 2001 From: Drewry Pope Date: Sat, 19 Sep 2020 21:46:40 -0500 Subject: [PATCH] fix(gh-actions): && not || --- .github/workflows/pr.check.base-branch.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr.check.base-branch.yml b/.github/workflows/pr.check.base-branch.yml index 5a5bb77..4be5908 100644 --- a/.github/workflows/pr.check.base-branch.yml +++ b/.github/workflows/pr.check.base-branch.yml @@ -137,7 +137,7 @@ jobs: env: MATRIX_CONTEXT: ${{ toJson(matrix) }} run: echo "$MATRIX_CONTEXT" - - if: github.ref != 'refs/heads/dev' && github.ref != 'refs/heads/next' && github.ref != 'refs/heads/main' && github.head_ref != 'dev' && github.head.ref != 'dev' && github.head_ref != 'next' && github.head.ref != 'next' && github.head_ref != 'main' && github.head.ref != 'main' || github.event.pull_request.head.ref == 'dev' || github.event.pull_request.head.ref == 'next' || github.event.pull_request.head.ref == 'main' + - if: github.ref != 'refs/heads/dev' && github.ref != 'refs/heads/next' && github.ref != 'refs/heads/main' && github.head_ref != 'dev' && github.head.ref != 'dev' && github.head_ref != 'next' && github.head.ref != 'next' && github.head_ref != 'main' && github.head.ref != 'main' && github.event.pull_request.head.ref == 'dev' && github.event.pull_request.head.ref == 'next' && github.event.pull_request.head.ref == 'main' name: Check base-branch(feature) - main,next=>dev (FORCE) uses: dezren39/check-base-branch-action@v2 with: