From 3d9c89c8cc0d9e177dd951db26352357405a559e Mon Sep 17 00:00:00 2001 From: Josh Wilson Date: Wed, 29 Mar 2023 13:43:10 +0200 Subject: [PATCH] ci: dont skip the merge checks --- .github/workflows/merge.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index c0983e098a..c5d2502494 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -23,7 +23,7 @@ jobs: # make sure all the jobs are not failed. # Note that the duplicated jobs might be skipped. merge-after-tests: - if: "!startsWith(github.event.head_commit.message, 'chore(release):') && needs.pre_job.outputs.should_skip != 'true'" + if: "!startsWith(github.event.head_commit.message, 'chore(release):')" name: Allow merge if all tests have passed runs-on: ${{ matrix.os }} strategy: @@ -41,7 +41,7 @@ jobs: # make sure all the os agnostic specific jobs pass # (those that are not os dependent, so we only run once) merge-after-os-agnostic-only-tests: - if: "!startsWith(github.event.head_commit.message, 'chore(release):') && needs.pre_job.outputs.should_skip != 'true'" + if: "!startsWith(github.event.head_commit.message, 'chore(release):')" name: Allow merge if all os-agnostic code quality checks pass runs-on: ubuntu-latest needs: