From 3c639a840f5072b1f8f215f37e41e0a843694c14 Mon Sep 17 00:00:00 2001 From: Nicholas Boll Date: Wed, 12 Oct 2022 11:55:39 -0600 Subject: [PATCH] ci: Forward merge commits that skip releases [skip release] --- .github/workflows/forward-merge.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/forward-merge.yml b/.github/workflows/forward-merge.yml index a5ed1dbefb..e087bf05e7 100644 --- a/.github/workflows/forward-merge.yml +++ b/.github/workflows/forward-merge.yml @@ -17,8 +17,9 @@ jobs: # forward merge would run twice because every commit on master/support causes a new commit # pushed back to the branch. So we ignore all non-release commits on support/master because # the release workflow will commit a release commit starting with `chore: Release ...` back to - # the branch and this job will run on that commit instead. - if: "((github.ref_name == 'support' || github.ref_name == 'master') && startsWith(github.event.head_commit.message, 'chore: Release')) || startsWith(github.ref_name, 'prerelease/')" + # the branch and this job will run on that commit instead. Also, forward merges that skipped + # a release + if: "((github.ref_name == 'support' || github.ref_name == 'master') && startsWith(github.event.head_commit.message, 'chore: Release')) || startsWith(github.ref_name, 'prerelease/') || contains(github.event.head_commit.message, '[skip release]')" runs-on: ubuntu-latest outputs: # Output branch names for the make-pull-request job branch: ${{steps.extract-branch.outputs.branch}}