From 5bf9dd05ca048d54ae5869351154dac63a0cf072 Mon Sep 17 00:00:00 2001
From: dneto <dneto@google.com>
Date: Tue, 28 Apr 2026 17:04:56 -0400
Subject: [PATCH 1/2] Use bazel 7.4.0, update re2, abseil

re2 2025-11-05.bcr.1
abseil as of around December 2025
---
 .bazelversion                             |  2 +-
 DEPS                                      |  4 ++--
 MODULE.bazel                              |  6 +++---
 kokoro/macos-clang-release-bazel/build.sh | 10 +++++-----
 kokoro/scripts/linux/build-docker.sh      |  4 ++--
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.bazelversion b/.bazelversion
index a8907c0..ba7f754 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1 +1 @@
-7.0.2
+7.4.0
diff --git a/DEPS b/DEPS
index 026c8fa..5872544 100644
--- a/DEPS
+++ b/DEPS
@@ -3,11 +3,11 @@ use_relative_paths = True
 vars = {
   'github': 'https://github.com',
 
-  'abseil_revision': '8e45685002488b55f24cb67a795eaa8d1c3297a1',
+  'abseil_revision': '630e92d5d51d73a1f60ddd7654980ca2eae91582',
 
   'googletest_revision': 'f625681bc4086c35099475f0d17e161f1c6ac9a1',
 
-  're2_revision': '03da4fc0857c285e3a26782f6bc8931c4c950df4',
+  're2_revision': '927f5d53caf8111721e734cf24724686bb745f55',
 }
 
 deps = {
diff --git a/MODULE.bazel b/MODULE.bazel
index dbebaa7..9f22635 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -4,7 +4,7 @@ Effcee is a C++ library for stateful pattern matching of strings inspired by
 LLVM's FileCheck.
 """
 
-bazel_dep(name = "rules_python", version = "0.31.0")
+bazel_dep(name = "rules_python", version = "1.6.3")
 python = use_extension("@rules_python//python/extensions:python.bzl", "python")
 python.toolchain(
     configure_coverage_tool = False,
@@ -14,8 +14,8 @@ python.toolchain(
 
 bazel_dep(
     name = "googletest",
-    version = "1.14.0",
+    version = "1.17.0",
     dev_dependency = True,
 )
 
-bazel_dep(name = "re2", version = "2024-04-01")
+bazel_dep(name = "re2", version = "2025-11-05.bcr.1")
diff --git a/kokoro/macos-clang-release-bazel/build.sh b/kokoro/macos-clang-release-bazel/build.sh
index 6e68ae6..0fabd2f 100644
--- a/kokoro/macos-clang-release-bazel/build.sh
+++ b/kokoro/macos-clang-release-bazel/build.sh
@@ -32,15 +32,15 @@ git config --global --add safe.directory $SRC
 cd $SRC
 /usr/bin/python3 utils/git-sync-deps
 
-# Get bazel 7.0.2
+# Get bazel 7.4.0
 gcloud config set auth/disable_credentials True
-gcloud storage cp gs://bazel/7.0.2/release/bazel-7.0.2-darwin-x86_64 .
-chmod +x bazel-7.0.2-darwin-x86_64
+gcloud storage cp gs://bazel/7.4.0/release/bazel-7.4.0-darwin-x86_64 .
+chmod +x bazel-7.4.0-darwin-x86_64
 
 echo $(date): Build everything...
-./bazel-7.0.2-darwin-x86_64 build --cxxopt=-std=c++17 :all
+./bazel-7.4.0-darwin-x86_64 build --cxxopt=-std=c++17 :all
 echo $(date): Build completed.
 
 echo $(date): Starting bazel test...
-./bazel-7.0.2-darwin-x86_64 test --cxxopt=-std=c++17 :all
+./bazel-7.4.0-darwin-x86_64 test --cxxopt=-std=c++17 :all
 echo $(date): Bazel test completed.
diff --git a/kokoro/scripts/linux/build-docker.sh b/kokoro/scripts/linux/build-docker.sh
index 5c5bb04..76747a8 100755
--- a/kokoro/scripts/linux/build-docker.sh
+++ b/kokoro/scripts/linux/build-docker.sh
@@ -29,7 +29,7 @@ function die {
 # This is required to run any git command in the docker since owner will
 # have changed between the clone environment, and the docker container.
 # Marking the root of the repo as safe for ownership changes.
-git config --global --add safe.directory $ROOT_DIR
+git config --global --add safe.directory '*'
 
 . /bin/using.sh # Declare the bash `using` function for configuring toolchains.
 
@@ -101,7 +101,7 @@ if [ $TOOL = "cmake" ]; then
   ctest --output-on-failure --timeout 300
   echo $(date): ctest completed.
 elif [ $TOOL = "bazel" ]; then
-  using bazel-7.0.2
+  using bazel-7.4.0
 
   echo $(date): Build everything...
   bazel build --cxxopt=-std=c++17 :all

From 829cd0a6d719be8048c82bd3edc85aed4727d10f Mon Sep 17 00:00:00 2001
From: dneto <dneto@google.com>
Date: Mon, 27 Apr 2026 19:02:14 -0400
Subject: [PATCH 2/2] kokoro: use GCC 15

Google internal bug 506281797
---
 kokoro/scripts/linux/build-docker.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kokoro/scripts/linux/build-docker.sh b/kokoro/scripts/linux/build-docker.sh
index 76747a8..fda8e34 100755
--- a/kokoro/scripts/linux/build-docker.sh
+++ b/kokoro/scripts/linux/build-docker.sh
@@ -48,7 +48,7 @@ case $COMPILER in
     using clang-18
     ;;
   gcc)
-    using gcc-13
+    using gcc-15
     ;;
   *)
     die expected COMPILER to be clang or gcc