From 7f846f1176b308d8e99fefd635045c43386a83a1 Mon Sep 17 00:00:00 2001 From: Mark Rousskov Date: Mon, 6 Sep 2021 13:08:43 -0400 Subject: [PATCH 1/3] 1.56.0 beta backport-of: nothing --- src/ci/channel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ci/channel b/src/ci/channel index bf867e0ae5b6c..65b2df87f7df3 100644 --- a/src/ci/channel +++ b/src/ci/channel @@ -1 +1 @@ -nightly +beta From 48c2f21753822bae66776fcf457f389c718a9700 Mon Sep 17 00:00:00 2001 From: Mark Rousskov Date: Mon, 6 Sep 2021 13:16:47 -0400 Subject: [PATCH 2/3] Do not unshallow -- already done by other code backport-of: none --- src/ci/scripts/verify-backported-commits.sh | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/ci/scripts/verify-backported-commits.sh b/src/ci/scripts/verify-backported-commits.sh index 1023e4b0e2837..d3da6d1ac915a 100755 --- a/src/ci/scripts/verify-backported-commits.sh +++ b/src/ci/scripts/verify-backported-commits.sh @@ -18,14 +18,6 @@ verify_backported_commits_main() { exit 0 fi - echo 'git: unshallowing the repository so we can check commits' - git fetch \ - --no-tags \ - --no-recurse-submodules \ - --progress \ - --prune \ - --unshallow - if [[ $ci_base_branch == "beta" ]]; then verify_cherries master "$BETA_LIMIT" \ || exit 1 From 7656e060a6ecd88d292e54e2378a3093bd129492 Mon Sep 17 00:00:00 2001 From: Mark Rousskov Date: Tue, 7 Sep 2021 10:12:12 -0400 Subject: [PATCH 3/3] Bump RLS submodule --- src/tools/rls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/rls b/src/tools/rls index a82a0527057ea..bf88026f11f2c 160000 --- a/src/tools/rls +++ b/src/tools/rls @@ -1 +1 @@ -Subproject commit a82a0527057eab59c24a0452add35ccb39584e80 +Subproject commit bf88026f11f2cc7bb9fefdfe1dbcab642f110afa