figma · dmiller-figma · Nov 26, 2025 · Nov 26, 2025 · Dec 1, 2025 · Dec 2, 2025
diff --git a/.bazelci/build_bazel_binaries.yml b/.bazelci/build_bazel_binaries.yml
@@ -1,6 +1,13 @@
 ---
 platforms:
-  centos7_java11_devtoolset10:
+  rockylinux8:
+    build_targets:
+      - "//src:bazel"
+      - "//src:bazel_nojdk"
+    build_flags:
+      - "-c"
+      - "opt"
+  rockylinux8_arm64:
     build_targets:
       - "//src:bazel"
       - "//src:bazel_nojdk"
@@ -14,7 +21,17 @@ platforms:
     build_flags:
       - "-c"
       - "opt"
-  ubuntu2204:
+  ubuntu2004_arm64:
+    build_targets:
+      - "//src:bazel"
+      - "//src:bazel_nojdk"
+    build_flags:
+      - "-c"
+      - "opt"
+      # https://github.com/bazelbuild/continuous-integration/issues/2353
+      - "--linkopt=-Wl,--no-fix-cortex-a53-843419"
+      - "--host_linkopt=-Wl,--no-fix-cortex-a53-843419"
+  ubuntu2404:
     build_targets:
       - "//src:bazel"
       - "//src:bazel_nojdk"

diff --git a/.bazelci/postsubmit.yml b/.bazelci/postsubmit.yml
diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
diff --git a/.bazelrc b/.bazelrc
@@ -1,102 +1,101 @@
 common --enable_platform_specific_config
 
 # Shared configuration flags to build and test Bazel on RBE.
-build:remote_shared --remote_instance_name=projects/bazel-untrusted/instances/default_instance
-build:remote_shared --remote_executor=grpcs://remotebuildexecution.googleapis.com
-build:remote_shared --remote_download_toplevel
-build:remote_shared --remote_timeout=600
-build:remote_shared --google_default_credentials
-build:remote_shared --jobs=100
-build:remote_shared --action_env=PATH=/bin:/usr/bin:/usr/local/bin
-build:remote_shared --java_runtime_version=rbe_jdk
-build:remote_shared --tool_java_runtime_version=rbe_jdk
-# Workaround for singlejar incompatibility with RBE
-build:remote_shared --noexperimental_check_desugar_deps
-
-# Configuration to build and test Bazel on RBE on Ubuntu 18.04 with Java 11
-build:ubuntu2004_java11 --extra_toolchains=@rbe_ubuntu2004_java11//java:all
-build:ubuntu2004_java11 --crosstool_top=@rbe_ubuntu2004_java11//cc:toolchain
-build:ubuntu2004_java11 --extra_toolchains=@rbe_ubuntu2004_java11//config:cc-toolchain
-build:ubuntu2004_java11 --extra_execution_platforms=//:rbe_ubuntu2004_java11_platform,//:rbe_ubuntu2004_java11_highcpu_platform
-build:ubuntu2004_java11 --host_platform=//:rbe_ubuntu2004_java11_platform
-build:ubuntu2004_java11 --platforms=//:rbe_ubuntu2004_java11_platform
-build:ubuntu2004_java11 --config=remote_shared
+common:remote_shared --remote_instance_name=projects/bazel-untrusted/instances/default_instance
+common:remote_shared --remote_executor=grpcs://remotebuildexecution.googleapis.com
+common:remote_shared --remote_download_toplevel
+common:remote_shared --remote_timeout=600
+common:remote_shared --google_default_credentials
+common:remote_shared --jobs=100
+common:remote_shared --action_env=PATH=/bin:/usr/bin:/usr/local/bin
+
+# Configuration to build and test Bazel on RBE on Ubuntu 20.04
+common:ubuntu2404 --extra_toolchains=@rbe_ubuntu2404//config:cc-toolchain
+common:ubuntu2404 --extra_execution_platforms=//:rbe_ubuntu2404_platform,//:rbe_ubuntu2404_highcpu_platform
+common:ubuntu2404 --host_platform=//:rbe_ubuntu2404_platform
+common:ubuntu2404 --platforms=//:rbe_ubuntu2404_platform
+common:ubuntu2404 --config=remote_shared
 
 # Alias
-build:remote --config=ubuntu2004_java11
+common:remote --config=ubuntu2404
 
-build:macos --macos_minimum_os=10.11
+common:macos --host_macos_minimum_os=10.13
+common:macos --macos_minimum_os=10.13
 
-# On Windows, we need pywin32 pip package, which doesn't work with the Python hermetic toolchain.
-# See https://github.com/bazelbuild/rules_python/issues/1356
-# Therefore, use the local detected Python toolchain on Windows.
-build:windows --extra_toolchains=@bazel_tools//tools/python:autodetecting_toolchain
-
-build:windows_arm64 --platforms=//:windows_arm64
-build:windows_arm64 --extra_toolchains=@local_config_cc//:cc-toolchain-arm64_windows
-# When cross-compiling, the local Java runtime, which is used by default, will not be compatible
-# with the target.
-build:windows_arm64 --java_runtime_version=remotejdk_11
+common:windows_arm64 --platforms=//:windows_arm64
+common:windows_arm64 --extra_toolchains=@local_config_cc//:cc-toolchain-arm64_windows
 
 # Check direct Bazel module dependencies are up-to-date
 common --check_direct_dependencies=error
 
 # Add mirrors for certain download URLs
-common --experimental_downloader_config=bazel_downloader.cfg
-
-# Enable modern C++ features
-build:linux --cxxopt=-std=c++17
-build:linux --host_cxxopt=-std=c++17
-build:macos --cxxopt=-std=c++17
-build:macos --host_cxxopt=-std=c++17
-build:windows --cxxopt=/std:c++17
-build:windows --host_cxxopt=/std:c++17
-
-# Enable Java 11 language features (https://github.com/bazelbuild/bazel/issues/14592)
-build --java_language_version=11
-build --tool_java_language_version=11
-
-# Fail if a glob doesn't match anything (https://github.com/bazelbuild/bazel/issues/8195)
-build --incompatible_disallow_empty_glob
-
-# Manually enable cc toolchain resolution before it is flipped. https://github.com/bazelbuild/bazel/issues/7260
-build --incompatible_enable_cc_toolchain_resolution
-
-# Fix non-deterministic Java compilation failures (https://github.com/bazelbuild/bazel/issues/3236)
-build --incompatible_sandbox_hermetic_tmp
+common --downloader_config=bazel_downloader.cfg
+
+# Add BCR module mirrors
+common --module_mirrors=https://bcr.cloudflaremirrors.com
+
+# Some integration tests need the PATH environment variable set.
+common --test_env=PATH
+
+# Suppress warnings from external repos, we have no direct control on them anyway.
+common:linux --per_file_copt=external/.*@-w
+common:linux --host_per_file_copt=external/.*@-w
+common:macos --per_file_copt=external/.*@-w
+common:macos --host_per_file_copt=external/.*@-w
+common:windows --per_file_copt=external/.*@/w
+common:windows --host_per_file_copt=external/.*@/w
+
+# Enable Protobuf MSVC support on Windows
+common:windows --define=protobuf_allow_msvc=true
+
+# Enable Java 21 language features and compile for a Java 25 runtime, matching
+# version of the embedded JDK.
+common --java_language_version=21
+common --tool_java_language_version=21
+common --java_runtime_version=remotejdk_25
+common --tool_java_runtime_version=remotejdk_25
+# Reduce the amount of warnings shown due to the deprecation of most Unsafe
+# methods.
+# TODO: Remove this after migrating more code to use VarHandles.
+common --javacopt=-Xlint:-removal
+common --host_javacopt=-Xlint:-removal
+common --jvmopt=--sun-misc-unsafe-memory-access=allow
 
 # User-specific .bazelrc
 try-import %workspace%/user.bazelrc
 
-build:docs --workspace_status_command=scripts/docs/get_workspace_status.sh
+common:docs --workspace_status_command=scripts/docs/get_workspace_status.sh
 
 # Flags for CI builds
 ## Common
 common:ci-common --lockfile_mode=error
 
 ## For Linux
 common:ci-linux --config=ci-common
-build:ci-linux --repository_cache=/var/lib/buildkite-agent/bazeltest/repo_cache
-test:ci-linux --test_env=TEST_INSTALL_BASE=/var/lib/buildkite-agent/bazeltest/install_base
-test:ci-linux --test_env=REPOSITORY_CACHE=/var/lib/buildkite-agent/bazeltest/repo_cache
-test:ci-linux --test_env=REMOTE_NETWORK_ADDRESS=bazel.build:80
+common:ci-linux --repository_cache=/var/lib/buildkite-agent/bazeltest/repo_cache
+common:ci-linux --test_env=TEST_INSTALL_BASE=/var/lib/buildkite-agent/bazeltest/install_base
+common:ci-linux --test_env=REPOSITORY_CACHE=/var/lib/buildkite-agent/bazeltest/repo_cache
+common:ci-linux --test_env=REMOTE_NETWORK_ADDRESS=bazel.build:80
 test:ci-linux --sandbox_writable_path=/var/lib/buildkite-agent/bazeltest
 test:ci-linux --sandbox_default_allow_network=false
 
 ## For macOS
 common:ci-macos --config=ci-common
-build:ci-macos --repository_cache=/Users/buildkite/bazeltest/repo_cache
-test:ci-macos --test_env=TEST_INSTALL_BASE=/Users/buildkite/bazeltest/install_base
-test:ci-macos --test_env=REPOSITORY_CACHE=/Users/buildkite/bazeltest/repo_cache
-test:ci-macos --test_env=REMOTE_NETWORK_ADDRESS=bazel.build:80
+common:ci-macos --repository_cache=/Users/buildkite/bazeltest/repo_cache
+common:ci-macos --experimental_collect_system_network_usage
+common:ci-macos --test_env=TEST_INSTALL_BASE=/Users/buildkite/bazeltest/install_base
+common:ci-macos --test_env=REPOSITORY_CACHE=/Users/buildkite/bazeltest/repo_cache
+common:ci-macos --test_env=REMOTE_NETWORK_ADDRESS=bazel.build:80
 test:ci-macos --sandbox_writable_path=/Users/buildkite/bazeltest
-test:ci-macos --sandbox_default_allow_network=false
+# TODO(pcloudy): Revert to false once https://github.com/bazelbuild/bazel/issues/23726 is resolved.
+test:ci-macos --sandbox_default_allow_network=true
+common:ci-macos --test_tag_filters=-no_macos
 
 ## For Windows
 common:ci-windows --config=ci-common
-build:ci-windows --repository_cache=C:/b/bazeltest_repo_cache
-test:ci-windows --test_env=BAZEL_VC
-test:ci-windows --test_env=JAVA_HOME
-test:ci-windows --test_env=TEST_INSTALL_BASE=C:/b/bazeltest_install_base
-test:ci-windows --test_env=REPOSITORY_CACHE=C:/b/bazeltest_repo_cache
-test:ci-windows --test_tag_filters=-no_windows,-slow
+common:ci-windows --repository_cache=C:/b/bazeltest_repo_cache
+common:ci-windows --test_env=BAZEL_VC
+common:ci-windows --test_env=JAVA_HOME
+common:ci-windows --test_env=TEST_INSTALL_BASE=C:/b/bazeltest_install_base
+common:ci-windows --test_env=REPOSITORY_CACHE=C:/b/bazeltest_repo_cache
+common:ci-windows --test_tag_filters=-no_windows,-slow
diff --git a/.bazelversion b/.bazelversion
@@ -1 +1 @@
-7.0.0
+9.1.1
diff --git a/.gitattributes b/.gitattributes
@@ -2,5 +2,16 @@
 BUILD linguist-language=Python
 site/* linguist-documentation
 
-# Files that should not use CRLF line endings, even on Windows.
-tools/genrule/genrule-setup.sh -text
+# Github excludes files in 'build' directory from their search by default.
+# This negates the exclusion.
+#
+# For more information, see:
+#   https://docs.github.com/en/search-github/searching-on-github/finding-files-on-github#customizing-excluded-files
+**/build/** linguist-generated=false
+
+# Files should not use CRLF line endings, even on Windows.
+* -text
+
+# A custom merge driver for the Bazel lockfile.
+# https://bazel.build/external/lockfile#automatic-resolution
+MODULE.bazel.lock merge=bazel-lockfile-merge
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -2,9 +2,9 @@ name: Bug report
 description: File a bug report
 labels: ["type: bug", "untriaged"]
 assignees:
-  - rakshitasingh05
-  - sgowroji
+  - bharadwaj08-one
   - iancha1992
+  - satyanandak
 body:
   - type: markdown
     attributes:
@@ -22,15 +22,13 @@ body:
   - type: dropdown
     id: subteam
     attributes:
-      label: >
-        Which category does this issue belong to?
-      description: >
-        Answering this will help us triage this issue faster and more accurately to the
-        relevant team(s).
+      label: Which category does this issue belong to?
+      description: Help us triage this issue faster and more accurately to the relevant team(s). Check the [team labels description](https://bazel.build/contribute/maintainers-guide#team-labels) first to make sure you select the most accurate label.
       multiple: true
       options:
         - Android
-        - C++/Objective-C Rules
+        - C++ Rules
+        - Objective-C Rules
         - CLI
         - Configurability
         - Core
@@ -72,14 +70,14 @@ body:
     id: source
     attributes:
       label: >
-        What's the output of `git remote get-url origin; git rev-parse master; git rev-parse HEAD` ?
+        What's the output of `git remote get-url origin; git rev-parse HEAD` ?
       render: text
   - type: textarea
     id: bisect
     attributes:
       label: >
-        Is this a regression? If yes, please try to identify the Bazel commit where the bug was
-        introduced.
+        If this is a regression, please try to identify the Bazel commit where the bug was
+        introduced with bazelisk --bisect.
       description: >
         If the problem is specific to the most recent release or the Bazel@HEAD version and it
         doesn't occur in earlier versions, you can use the `bazelisk --bisect=<GOOD>..<BAD>`

diff --git a/.github/ISSUE_TEMPLATE/cherry_pick_request.yml b/.github/ISSUE_TEMPLATE/cherry_pick_request.yml
@@ -25,25 +25,23 @@ body:
         Which category does this issue belong to? Please select the corresponding label(s).
       multiple: true
       options:
-        - team-CLI
-        - team-OSS
-        - team-Core
-        - team-Bazel
         - team-Android
-        - z-team-Apple
-        - team-Rules-API
         - team-Rules-CPP
-        - team-Local-Exec
-        - team-Rules-Java
         - team-Rules-ObjC
+        - team-CLI
+        - team-Configurability
+        - team-Core
+        - team-Documentation
+        - team-ExternalDeps
+        - team-Rules-Java
         - team-Loading-API
+        - team-Local-Exec
+        - team-OSS
         - team-Performance
-        - team-Remote-Exec
-        - team-ExternalDeps
         - team-Rules-Python
+        - team-Remote-Exec
+        - team-Rules-API
         - team-Rules-Server
-        - team-Documentation
-        - team-Configurability
         - team-Starlark-Integration
         - team-Starlark-Interpreter
   - type: textarea
@@ -54,4 +52,4 @@ body:
       label: >
         Reviewers
       description: >
-        Please provide reviewers for the cherry-pick PR. E.g. @iancha1992, @bazelbuild/triage
+        Please provide reviewers for the cherry-pick PR. E.g. @iancha1992, @keertk
diff --git a/.github/ISSUE_TEMPLATE/doc_issue.yml b/.github/ISSUE_TEMPLATE/doc_issue.yml
@@ -2,9 +2,9 @@ name: Documentation issue
 description: File a documentation issue (through bazel.build's "report an issue" button)
 labels: ["type: documentation (cleanup)", "untriaged", "team-Documentation"]
 assignees:
-  - rakshitasingh05
-  - sgowroji
+  - bharadwaj08-one
   - iancha1992
+  - satyanandak
 body:
   - type: input
     id: link

diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -2,9 +2,9 @@ name: Feature request
 description: Suggest a new feature
 labels: ["type: feature request", "untriaged"]
 assignees:
-  - rakshitasingh05
-  - sgowroji
+  - bharadwaj08-one
   - iancha1992
+  - satyanandak
 body:
   - type: markdown
     attributes:
@@ -22,15 +22,13 @@ body:
   - type: dropdown
     id: subteam
     attributes:
-      label: >
-        Which category does this issue belong to?
-      description: >
-        Answering this will help us triage this issue faster and more accurately to the
-        relevant team(s).
+      label: Which category does this issue belong to?
+      description: Help us triage this issue faster and more accurately to the relevant team(s). Check the [team labels description](https://bazel.build/contribute/maintainers-guide#team-labels) first to make sure you select the most accurate label.
       multiple: true
       options:
         - Android
-        - C++/Objective-C Rules
+        - C++ Rules
+        - Objective-C Rules
         - CLI
         - Configurability
         - Core
@@ -71,7 +69,7 @@ body:
     id: source
     attributes:
       label: >
-        What's the output of `git remote get-url origin; git rev-parse master; git rev-parse HEAD` ?
+        What's the output of `git remote get-url origin; git rev-parse HEAD` ?
       render: text
   - type: textarea
     id: relevant-info