Skip to content

Commit

Permalink
ci: dont skip the merge checks
Browse files Browse the repository at this point in the history
  • Loading branch information
joshuef authored and oetyng committed Mar 29, 2023
1 parent 1aeaafa commit 3d9c89c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down

0 comments on commit 3d9c89c

Please sign in to comment.