diff options
| author | Ting-Yuan Huang <laszio@google.com> | 2022-04-14 01:16:39 -0700 |
|---|---|---|
| committer | Jiaxiang Chen <roaringacw@gmail.com> | 2022-04-14 09:38:17 -0700 |
| commit | bdc15cbf29a580ab14d04c1ba02b4510562d9bef (patch) | |
| tree | c24cb1997444e0e7b4c86cea5336ba44b8830dbe /.github/workflows/auto-merge.yml | |
| parent | a593773b8a30f2e288fc5a73d097b74ff524d04c (diff) | |
| download | ksp-bdc15cbf29a580ab14d04c1ba02b4510562d9bef.tar.gz | |
Fix auto-merge, part 2
Diffstat (limited to '.github/workflows/auto-merge.yml')
| -rw-r--r-- | .github/workflows/auto-merge.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index eb16f7b3..aab9729e 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -122,7 +122,7 @@ jobs: MERGE_BASE=$(git merge-base HEAD origin/main) 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 --grep UPDATE_KOTLIN_VERSION) + VERSION_BUMPS=$(git log origin/main --pretty=%H --grep UPDATE_KOTLIN_VERSION) TO_PICK=$(grep -Fxv -f <(echo "$PICKED"; echo "$VERSION_BUMPS"; echo "$DONT_PICK") <(echo "$CANDIDATES") | tac) echo Picking $TO_PICK if [ -n "$TO_PICK" ]; then git cherry-pick -x $TO_PICK; fi |