diff options
| author | Ting-Yuan Huang <laszio@google.com> | 2022-04-07 19:11:05 -0700 |
|---|---|---|
| committer | laszio <ting-yuan@users.noreply.github.com> | 2022-04-07 21:49:42 -0700 |
| commit | 994d1a3e62e2633b2086bc106d0428555961a760 (patch) | |
| tree | 6669dd7bae8094b25f1bc82cde8aa9c58e8deee8 /.github/workflows/auto-merge.yml | |
| parent | 3052f52954eca03b0f809c7448e8dedd84ac5e5f (diff) | |
| download | ksp-994d1a3e62e2633b2086bc106d0428555961a760.tar.gz | |
Clean DONT_PICK commits up to 1.0.6-release
Diffstat (limited to '.github/workflows/auto-merge.yml')
| -rw-r--r-- | .github/workflows/auto-merge.yml | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index cb8dd512..071a7f5e 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -26,15 +26,10 @@ 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 - 42ef4e0b1696ddbcabbb188d7761c8692ca9f988 - 6bb81cbc304a006b05e0fb4b6d46ec2d94d73357 - e74a18cf092877c3a73c2c58f5fc36cc1b6e33b3 35e1556f6f329714a9d730ea4a7743317535ce1a 2ed353a57eb379a3b8fa6401cbf3a7abe3da7e8b d961b62f71147bfd148d8648bfdf566525a401e7 fbb02bfeafdb69b876bc6c0bd433fd1ebf4c8150 - 80f75d5333d15961c9fb95fe47040a2fcf28c16c - d6f2b6eef0b466a35fc4b8e1e14ee8ef05cf03e6 EOF ) git config --global user.email "kotlin-symbol-processing@google.com" |