Do not pick d44ad7d which is risky for 1.0.15

google · Nov 22, 2023 · 8417548 · 8417548
1 parent 7395a14
commit 8417548
Showing 1 changed file with 2 additions and 10 deletions.
diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml
@@ -28,11 +28,7 @@ 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
-        a0ec95f02b561fad1473a36ec7788aa6689db9ed
-        f1a7ae788e1f94df04bcd6d7eebfb0d8f487e429
-        15e9b54fe5b3e1c51e748b2856196e1eed6c4483
-        23a7adb763ca01c24db3a83fa17227ef218d3fdc
-        e951fb9c14defe19072b1d3b78e48eedc1fb1b77
+        d44ad7d9824aa0f073ce3c53e79361ae0f030d3b
         EOF
         )
         git config --global user.email "[email protected]"
@@ -113,11 +109,7 @@ 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
-          a0ec95f02b561fad1473a36ec7788aa6689db9ed
-          f1a7ae788e1f94df04bcd6d7eebfb0d8f487e429
-          15e9b54fe5b3e1c51e748b2856196e1eed6c4483
-          23a7adb763ca01c24db3a83fa17227ef218d3fdc
-          e951fb9c14defe19072b1d3b78e48eedc1fb1b77
+          d44ad7d9824aa0f073ce3c53e79361ae0f030d3b
           EOF
           )
           git config --global user.email "[email protected]"