Remove ICU locale from string.format

This change also updates cel-cpp to use bzlmod
as a simplification for the WORKSPACE builds
which were difficult to maintain and incompatible
with Bazel module builds.

PiperOrigin-RevId: 743289379

Author: TristonianJones

.bazelrc

@@ -1,6 +1,6 @@
 build --cxxopt=-std=c++17 --host_cxxopt=-std=c++17
 build --cxxopt=-fsized-deallocation
-build --noenable_bzlmod
+build --enable_bzlmod
 build --copt=-Wno-deprecated-declarations
 build --compilation_mode=fastbuild
 

.bazelversion

@@ -1 +1 @@
-7.2.1
+7.3.2

Dockerfile

@@ -1,3 +1,28 @@
+# This Dockerfile is used to create a container around gcc9 and bazel for
+# building the CEL C++ library on GitHub.
+#
+# To update a new version of this container, use gcloud. You may need to run
+# `gcloud auth login` and `gcloud auth configure-docker` first.
+#
+# Note, if you need to run docker using `sudo` use the following commands
+# instead:
+#
+#     sudo gcloud auth login --no-launch-browser
+#     sudo gcloud auth configure-docker
+#
+# Run the following command from the root of the CEL repository:
+#
+#     gcloud builds submit --region=us -t gcr.io/cel-analysis/gcc9 .
+#
+# Once complete get the sha256 digest from the output using the following
+# command:
+#
+#     gcloud artifacts versions list --package=gcc9 --repository=gcr.io \
+#       --location=us
+#
+# The cloudbuild.yaml file must be updated to use the new digest like so:
+#
+#     - name: 'gcr.io/cel-analysis/gcc9@<SHA256>'
 FROM gcc:9
 
 # Install Bazel prerequesites and required tools.
@@ -21,7 +46,7 @@ RUN apt-get update && \
 
 # Install Bazel.
 # https://github.com/bazelbuild/bazel/releases
-ARG BAZEL_VERSION="7.2.1"
+ARG BAZEL_VERSION="7.3.2"
 ADD https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-installer-linux-x86_64.sh /tmp/install_bazel.sh
 RUN /bin/bash /tmp/install_bazel.sh && rm /tmp/install_bazel.sh
 

MODULE.bazel

@@ -0,0 +1,98 @@
+module(
+    name = "cel-cpp",
+)
+
+bazel_dep(
+    name = "bazel_skylib",
+    version = "1.7.1",
+)
+bazel_dep(
+    name = "googleapis",
+    version = "0.0.0-20241220-5e258e33.bcr.1",
+    repo_name = "com_google_googleapis",
+)
+bazel_dep(
+    name = "googleapis-cc",
+    version = "1.0.0",
+)
+bazel_dep(
+    name = "rules_cc",
+    version = "0.1.1",
+)
+bazel_dep(
+    name = "rules_java",
+    version = "7.6.5",
+)
+bazel_dep(
+    name = "rules_proto",
+    version = "7.0.2",
+)
+bazel_dep(
+    name = "rules_python",
+    version = "1.3.0",
+)
+bazel_dep(
+    name = "protobuf",
+    version = "27.0",
+    repo_name = "com_google_protobuf",
+)
+bazel_dep(
+    name = "abseil-cpp",
+    version = "20250127.1",
+    repo_name = "com_google_absl",
+)
+bazel_dep(
+    name = "googletest",
+    version = "1.16.0",
+    repo_name = "com_google_googletest",
+)
+bazel_dep(
+    name = "google_benchmark",
+    version = "1.9.2",
+    repo_name = "com_github_google_benchmark",
+)
+bazel_dep(
+    name = "re2",
+    version = "2024-07-02",
+    repo_name = "com_googlesource_code_re2",
+)
+bazel_dep(
+    name = "flatbuffers",
+    version = "25.2.10",
+    repo_name = "com_github_google_flatbuffers",
+)
+bazel_dep(
+    name = "cel-spec",
+    version = "0.21.2",
+    repo_name = "com_google_cel_spec",
+)
+
+python = use_extension("@rules_python//python/extensions:python.bzl", "python")
+python.toolchain(
+    configure_coverage_tool = False,
+    ignore_root_user_error = True,
+    python_version = "3.11",
+)
+
+CEL_SPEC_GIT_SHA = "ed0181bc27b110fa23193d98576afe774b448845"  # Mar 26, 2025
+
+archive_override(
+    module_name = "cel-spec",
+    strip_prefix = "cel-spec-" + CEL_SPEC_GIT_SHA,
+    urls = ["https://github.com/google/cel-spec/archive/" + CEL_SPEC_GIT_SHA + ".zip"],
+)
+
+ANTLR4_VERSION = "4.13.2"
+
+bazel_dep(
+    name = "antlr4-cpp-runtime",
+    version = "4.13.2",
+)
+
+http_jar = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_jar")
+
+http_jar(
+    name = "antlr4_jar",
+    sha256 = "eae2dfa119a64327444672aff63e9ec35a20180dc5b8090b7a6ab85125df4d76",
+    urls = ["https://www.antlr.org/download/antlr-" + ANTLR4_VERSION + "-complete.jar"],
+)

bazel/antlr.bzl

@@ -34,7 +34,7 @@ def antlr_cc_library(name, src, package):
         srcs = [generated],
         deps = [
             generated,
-            "@antlr4_runtimes//:cpp",
+            "@antlr4-cpp-runtime//:antlr4-cpp-runtime",
         ],
         linkstatic = 1,
     )

cloudbuild.yaml

@@ -1,10 +1,10 @@
 steps:
-- name: 'gcr.io/cel-analysis/gcc-9@sha256:5c08ae90e33a33010c8e518173a926143ba029affb54ceec288f375f474ea87f'
+- name: 'gcr.io/cel-analysis/gcc9@sha256:4d5ff2e55224398807235a44b57e9c5793e922ac46e9ff428536bb8f8e5790ce'
   args:
   - '--output_base=/bazel' # This is mandatory to avoid steps accidently sharing data.
   - 'test'
   - '...'
-  - '--noenable_bzlmod'
+  - '--enable_bzlmod'
   - '--copt=-Wno-deprecated-declarations'
   - '--compilation_mode=fastbuild'
   - '--test_output=errors'
@@ -16,15 +16,15 @@ steps:
   - '--google_default_credentials'
   id: gcc-9
   waitFor: ['-']
-- name: 'gcr.io/cel-analysis/gcc-9@sha256:5c08ae90e33a33010c8e518173a926143ba029affb54ceec288f375f474ea87f'
+- name: 'gcr.io/cel-analysis/gcc9@sha256:4d5ff2e55224398807235a44b57e9c5793e922ac46e9ff428536bb8f8e5790ce'
   env:
   - 'CC=clang-11'
   - 'CXX=clang++-11'
   args:
   - '--output_base=/bazel' # This is mandatory to avoid steps accidently sharing data.
   - 'test'
   - '...'
-  - '--noenable_bzlmod'
+  - '--enable_bzlmod'
   - '--copt=-Wno-deprecated-declarations'
   - '--compilation_mode=fastbuild'
   - '--test_output=errors'

conformance/BUILD

@@ -205,8 +205,6 @@ _TESTS_TO_SKIP_MODERN = [
     "string_ext/substring",
     "string_ext/trim",
     "string_ext/quote",
-    "string_ext/format",
-    "string_ext/format_errors",
     "string_ext/value_errors",
     "string_ext/type_errors",
 
@@ -262,8 +260,6 @@ _TESTS_TO_SKIP_LEGACY = [
     "string_ext/substring",
     "string_ext/trim",
     "string_ext/quote",
-    "string_ext/format",
-    "string_ext/format_errors",
     "string_ext/value_errors",
     "string_ext/type_errors",
 

eval/public/cel_options.cc

@@ -40,8 +40,7 @@ cel::RuntimeOptions ConvertToRuntimeOptions(const InterpreterOptions& options) {
                              options.enable_lazy_bind_initialization,
                              options.max_recursion_depth,
                              options.enable_recursive_tracing,
-                             options.enable_fast_builtins,
-                             options.locale};
+                             options.enable_fast_builtins};
 }
 
 }  // namespace google::api::expr::runtime

eval/public/cel_options.h

@@ -198,11 +198,6 @@ struct InterpreterOptions {
   //
   // Currently applies to !_, @not_strictly_false, _==_, _!=_, @in
   bool enable_fast_builtins = true;
-
-  // The locale to use for string formatting.
-  //
-  // Default is en_US.
-  std::string locale = "en_US";
 };
 // LINT.ThenChange(//depot/google3/runtime/runtime_options.h)
 

extensions/BUILD

@@ -611,7 +611,6 @@ cc_library(
         "@com_google_absl//absl/strings:string_view",
         "@com_google_absl//absl/time",
         "@com_google_protobuf//:protobuf",
-        "@icu4c",
     ],
 )