diff options
| author | Ting-Yuan Huang <laszio@google.com> | 2022-12-06 11:32:44 -0800 |
|---|---|---|
| committer | laszio <ting-yuan@users.noreply.github.com> | 2022-12-07 13:57:59 -0800 |
| commit | f043316635a66b16609a1b354bc868f42294f38b (patch) | |
| tree | 383c2c34324e7083f8e4771901dfbf9ada82ac06 | |
| parent | 8475968a50303890f1bd38c0204d0d9fe43a84f2 (diff) | |
| download | ksp-f043316635a66b16609a1b354bc868f42294f38b.tar.gz | |
Don't auto-merge recent KGP changes
which are not available in 1.7.22.
| -rw-r--r-- | .github/workflows/auto-merge.yml | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index 02d33a3e..6982dd5e 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -28,10 +28,12 @@ jobs: # Cherry pick new changes from main, except for version bumps. # A commit is a version bump IFF it touches third_party/prebuilt/repo DONT_PICK=$(cat <<EOF - 35e1556f6f329714a9d730ea4a7743317535ce1a - 2ed353a57eb379a3b8fa6401cbf3a7abe3da7e8b - d961b62f71147bfd148d8648bfdf566525a401e7 - fbb02bfeafdb69b876bc6c0bd433fd1ebf4c8150 + 76ac8de5cd4769b2cfd7c80ad156309c5f27d52a + 9675c5de0f689cb8563a0b6e1142a78747e8675c + fc22e8f947fb533e3f728252882c9dbe3f4d810d + caa3e0843dd169dcc3486d1ac28d16489324d564 + 1ed2d3b709adc53450eb1c09fffe33a50459cc88 + f0647fd2acffa78454700eb4750bf77caab05076 EOF ) git config --global user.email "kotlin-symbol-processing@google.com" @@ -112,10 +114,12 @@ jobs: # Cherry pick new changes from main, except for version bumps. # A commit is a version bump IFF it touches third_party/prebuilt/repo DONT_PICK=$(cat <<EOF - 35e1556f6f329714a9d730ea4a7743317535ce1a - 2ed353a57eb379a3b8fa6401cbf3a7abe3da7e8b - d961b62f71147bfd148d8648bfdf566525a401e7 - fbb02bfeafdb69b876bc6c0bd433fd1ebf4c8150 + 76ac8de5cd4769b2cfd7c80ad156309c5f27d52a + 9675c5de0f689cb8563a0b6e1142a78747e8675c + fc22e8f947fb533e3f728252882c9dbe3f4d810d + caa3e0843dd169dcc3486d1ac28d16489324d564 + 1ed2d3b709adc53450eb1c09fffe33a50459cc88 + f0647fd2acffa78454700eb4750bf77caab05076 EOF ) git config --global user.email "kotlin-symbol-processing@google.com" |