diff options
| author | Ting-Yuan Huang <laszio@google.com> | 2022-01-31 23:45:28 -0800 |
|---|---|---|
| committer | laszio <ting-yuan@users.noreply.github.com> | 2022-02-01 00:58:42 -0800 |
| commit | 42f466b173c3b664f146afcd734937bbe00168ac (patch) | |
| tree | 8422b57ff06b26f8169a09109e62e0d70f221973 /.github/workflows/auto-merge.yml | |
| parent | 42ef4e0b1696ddbcabbb188d7761c8692ca9f988 (diff) | |
| download | ksp-42f466b173c3b664f146afcd734937bbe00168ac.tar.gz | |
auto-merger: don't pick commits in DONT_PICK
Some commits are compiler version specific and they don't touch
third_party/prebuilt/repo. They shouldn't be picked automatically into
release branches.
Diffstat (limited to '.github/workflows/auto-merge.yml')
| -rw-r--r-- | .github/workflows/auto-merge.yml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index 7a070cc3..07d58c7e 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -22,6 +22,9 @@ jobs: ref: 1.0.3-release - name: merge commits from main to release branch + env: + # space separated hashs + DONT_PICK: 42ef4e0b1696ddbcabbb188d7761c8692ca9f988 run: | # Cherry pick new changes from main, except for version bumps. # A commit is a version bump IFF it touches third_party/prebuilt/repo @@ -31,7 +34,7 @@ jobs: CANDIDATES=$(git log --pretty=%H $MERGE_BASE..origin/main) PICKED=$(git log $MERGE_BASE..HEAD | sed -n "s/^[ ]*(cherry picked from commit \([a-z0-9]*\))$/\1/p") VERSION_BUMPS=$(git log --pretty=%H $MERGE_BASE..origin/main third_party/prebuilt/repo) - TO_PICK=$(grep -Fxv -f <(echo "$PICKED"; echo "$VERSION_BUMPS") <(echo "$CANDIDATES") | tac) + TO_PICK=$(grep -Fxv -f <(echo "$PICKED"; echo "$VERSION_BUMPS"; echo "$DONT_PICK") <(echo "$CANDIDATES") | tac) if [ -n "$TO_PICK" ]; then git cherry-pick -x $TO_PICK; fi - name: Setup Java 9 |