From dd6e6eb9f4474ba96845047ace77e79f351c6547 Mon Sep 17 00:00:00 2001
From: Keith Smiley <keithbsmiley@gmail.com>
Date: Fri, 22 Oct 2021 10:01:42 -0700
Subject: [PATCH 1/2] Test rolling release

Signed-off-by: Keith Smiley <keithbsmiley@gmail.com>
---
 toolchains/regenerate.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchains/regenerate.sh b/toolchains/regenerate.sh
index 04f380d6..5820e419 100755
--- a/toolchains/regenerate.sh
+++ b/toolchains/regenerate.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-BAZEL_VERSION=4.2.1
+BAZEL_VERSION=5.0.0-pre.20211011.2
 
 export RBE_AUTOCONF_ROOT=$(bazel info workspace)
 

From 6d2a0f07eb2f303fa0f61762b793166c07ef90a3 Mon Sep 17 00:00:00 2001
From: Keith Smiley <keithbsmiley@gmail.com>
Date: Fri, 22 Oct 2021 11:49:24 -0700
Subject: [PATCH 2/2] comment out temporarily

---
 toolchains/regenerate.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/toolchains/regenerate.sh b/toolchains/regenerate.sh
index 5820e419..5a60171f 100755
--- a/toolchains/regenerate.sh
+++ b/toolchains/regenerate.sh
@@ -15,9 +15,9 @@ if ! docker pull ${DOCKER_IMAGE}; then
 fi
 
 # If we are committing changes, pull before modifying to ensure no conflicts
-if [[ "true" == "${COMMIT_TOOLCHAINS}" ]]; then
-  git pull origin refs/heads/main --ff-only
-fi
+# if [[ "true" == "${COMMIT_TOOLCHAINS}" ]]; then
+#   git pull origin refs/heads/main --ff-only
+# fi
 
 rm -rf "${RBE_AUTOCONF_ROOT}/toolchains/configs/${OS_FAMILY}"
 mkdir -p "${RBE_AUTOCONF_ROOT}/toolchains/configs/${OS_FAMILY}"