CU-2083 Update bazel

Co-authored-by: Amp <[email protected]>
Amp-Thread-ID: https://ampcode.com/threads/T-019c669f-49c4-775f-9f56-3d21156edc22

Author: chrapkowski-sg

.aspect/workflows/config.yaml

@@ -0,0 +1,21 @@
+---
+queue: aspect-devx-service
+bazel:
+  rcfiles:
+      - ".aspect/bazelrc/ci.bazelrc"
+
+tasks:
+  - build:
+      targets:
+          - //...
+      bazel:
+        flags:
+          - "--config=ci"
+  - test:
+      targets:
+          - //test
+      bazel:
+        flags:
+          - "--config=ci"
+  - finalization:
+

.bazelrc

@@ -1,6 +1,10 @@
 try-import %workspace%/ci.bazelrc
 try-import %workspace%/buildbuddy.bazelrc
 
+# Disable bzlmod since this project uses WORKSPACE
+# Docs: https://bazel.build/external/migration#disable-bzlmod
+common --noenable_bzlmod
+
 # Import Aspect bazelrc presets
 import %workspace%/.aspect/bazelrc/bazel6.bazelrc
 import %workspace%/.aspect/bazelrc/convenience.bazelrc
@@ -17,10 +21,14 @@ common --enable_platform_specific_config
 # https://sourcegraph.com/github.com/grailbio/bazel-toolchain@d52ce5d96915428a5ee6f7079078df706c5fddab/-/blob/toolchain/cc_toolchain_config.bzl?L154:11
 build:linux --linkopt="-fuse-ld=lld"
 
-# Based on release notes from since we're on Bazel < 7
+# Based on release notes from toolchains_llvm
 # https://github.com/bazel-contrib/toolchains_llvm/releases/tag/0.10.3
 build --features=-supports_dynamic_linker
 build --features=-libtool
+# Disable layering_check which is enabled by default in LLVM's BUILD overlay.
+# toolchains_llvm 1.6.0 supports this feature (unlike the old grailbio toolchain),
+# but it breaks because @llvm_zlib wrapping @zlib doesn't export zlib.h in module maps.
+build --features=-layering_check
 
 # Not sure why setting all of these is necessary, but just setting cxxopt
 # Leads to usage of old C++ version when compiling LLVM, which needs C++14 or newer.

.bazelversion

@@ -1 +1 @@
-6.1.2
+7.5.0

.buildkite/pipeline.yaml

@@ -1,9 +1,9 @@
 $schema: "http://json.schemastore.org/buildkite"
 steps:
-  - label: ":bazel: Build and Test"
+  - label: ":lint-roller: Lint"
+    key: lint
     agents:
-      queue: bazel
-    key: build
+      queue: aspect-small-ubuntu-lts
     command: |
       ./tools/reformat.sh
       if ! git diff --quiet; then
@@ -17,8 +17,9 @@ steps:
 
       ./tools/lint.sh
 
-      # DO NOT remove --config=ci as that turns on sanitizers.
-      bazel --bazelrc=.bazelrc --bazelrc=.aspect/bazelrc/ci.bazelrc build //... --config=ci
-
-      # Don't use //... as that will also try to update snapshots
-      bazel --bazelrc=.bazelrc --bazelrc=.aspect/bazelrc/ci.bazelrc test //test --config=ci
+  - key: aspect-workflows-upload
+    label: ":aspect: Setup Aspect Workflows"
+    commands: |
+      rosetta steps | buildkite-agent pipeline upload
+    agents:
+      queue: aspect-small-ubuntu-lts

.github/actionlint.yaml

@@ -2,5 +2,5 @@
 self-hosted-runner:
   # Labels of self-hosted runner in array of strings.
   labels:
-    - ubuntu-22.04-32core-graph-team-amd64
-    - ubuntu-22.04-32core-graph-team-arm64
+    - ubuntu-24.04-32core-graph-team-amd64
+    - ubuntu-24.04-32core-graph-team-arm64

.github/workflows/release-docker.yml

@@ -15,10 +15,10 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: ubuntu-22.04-32core-graph-team-amd64
+          - os: ubuntu-24.04-32core-graph-team-amd64
             platform: linux/amd64
             binary-name: scip-clang-x86_64-linux
-          - os: ubuntu-22.04-32core-graph-team-arm64
+          - os: ubuntu-24.04-32core-graph-team-arm64
             platform: linux/arm64
             binary-name: scip-clang-arm64-linux
     runs-on: ${{ matrix.os }}

.github/workflows/release.yml

@@ -20,18 +20,14 @@ jobs:
     strategy:
       matrix:
         include:
-          - platform: "ubuntu-22.04"
-            container: "gcc:9.5.0-buster"
+          - platform: "ubuntu-24.04-32core-graph-team-amd64"
             config: "dev"
-          - platform: "ubuntu-22.04"
-            container: "gcc:9.5.0-buster"
+          - platform: "ubuntu-24.04-32core-graph-team-amd64"
             config: "release"
           # macOS 14 => arm64
           - platform: "macos-14"
-            container: ""
             config: "release"
     runs-on: ${{ matrix.platform }}
-    container: ${{ matrix.container }}
     env:
       TAG: ${{ github.event.ref }}
     permissions:
@@ -53,12 +49,10 @@ jobs:
           NEW_VERSION="${TAG_LIKE/v/}" ./tools/version_check.sh
       - name: "🐍 Install Bazelisk"
         run: |
-          if ! command -v bazelisk; then
-            if [ "$RUNNER_OS" == "Windows" ]; then
-              choco install bazelisk
-            elif [ "$RUNNER_OS" == "Linux" ]; then
-              curl -L https://github.com/bazelbuild/bazelisk/releases/download/v1.16.0/bazelisk-linux-amd64 > /usr/local/bin/bazel
-              chmod +x /usr/local/bin/bazel
+          if ! command -v bazelisk && ! command -v bazel; then
+            if [ "$RUNNER_OS" == "Linux" ]; then
+              sudo curl -L https://github.com/bazelbuild/bazelisk/releases/download/v1.16.0/bazelisk-linux-amd64 -o /usr/local/bin/bazel
+              sudo chmod +x /usr/local/bin/bazel
             else
               sudo npm install -g @bazel/bazelisk
             fi
@@ -72,10 +66,6 @@ jobs:
           create_credentials_file: true
       - name: "🚧 Build scip-clang"
         run: |
-          # Stop Windows from converting the // to /
-          # https://github.com/bazelbuild/bazel/commit/866ecc8c3d5e0b899e3f0c9c6b2265f16daae842
-          # https://stackoverflow.com/a/34386471
-          export MSYS2_ARG_CONV_EXCL="*"
           if [ "$RUNNER_OS" == "macOS" ]; then
             export BAZEL_MEM="13G"
           else # if [ "$RUNNER_OS" == "Linux" ]; then
@@ -129,7 +119,9 @@ jobs:
     name: "Create release"
     if: github.event_name != 'workflow_dispatch' || inputs.create_release
     needs: build-and-upload-artifacts
-    runs-on: "ubuntu-22.04"
+    runs-on: "ubuntu-24.04"
+    permissions:
+      contents: write
     steps:
       - uses: actions/checkout@v4
       - name: "📝 Create Release"

WORKSPACE

@@ -14,16 +14,27 @@ load("//:fetch_deps.bzl", "fetch_direct_dependencies")
 fetch_direct_dependencies()
 
 # Setup the toolchain before setting up other dependencies
+# Note: bazel_toolchain_dependencies() brings in rules_cc 0.2.14
 load("@toolchains_llvm//toolchain:deps.bzl", "bazel_toolchain_dependencies")
 
 bazel_toolchain_dependencies()
 
+# bazel_features needs its deps called explicitly
+load("@bazel_features//:deps.bzl", "bazel_features_deps")
+
+bazel_features_deps()
+
+# Set up cc_compatibility_proxy for rules_cc 0.2.14+ in WORKSPACE mode
+load("@rules_cc//cc:extensions.bzl", "compatibility_proxy_repo")
+
+compatibility_proxy_repo()
+
 load("//:setup_llvm.bzl", "setup_llvm_toolchain")
 
 setup_llvm_toolchain(name = "llvm_toolchain")
 
-load("@llvm_toolchain//:toolchains.bzl", "llvm_register_toolchains")
 load("@rules_python//python:repositories.bzl", "py_repositories", "python_register_toolchains")
+load("@llvm_toolchain//:toolchains.bzl", "llvm_register_toolchains")
 
 llvm_register_toolchains()
 

docs/Development.md

@@ -97,11 +97,13 @@ Run `./tools/reformat.sh` to reformat code and config files.
 
 ## IDE integration
 
-Run `./tools/regenerate-compdb.sh` to generate a compilation database
+Run `./tools/regenerate-compile-commands.sh` to generate a compilation database
 at the root of the repository. It will be automatically
 picked up by clangd-based editor extensions (you may
 need to reload the editor).
 
+Alternatively, run `bazel run //tools:refresh_compile_commands` directly.
+
 ## Debugging
 
 ### Stacktraces

fetch_deps.bzl

@@ -1,8 +1,8 @@
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_file")
 
 _BAZEL_SKYLIB_VERSION = "1.3.0"
-_PLATFORMS_COMMIT = "3fbc687756043fb58a407c2ea8c944bc2fe1d922"  # 2022 Nov 10
-_BAZEL_TOOLCHAIN_VERSION = "0.10.3"
+_PLATFORMS_VERSION = "1.0.0"  # Updated from 2022 commit for visionos support
+_BAZEL_TOOLCHAIN_VERSION = "1.6.0"
 _RULES_BOOST_COMMIT = "00b9b9ecb9b43564de44ea0b10e22b29dcf84d79"
 _LLVM_COMMIT = "e0f3110b854a476c16cce7b44472cd7838d344e9"  # Keep in sync with Version.h
 _ABSL_COMMIT = "4ffaea74c1f5408e0757547a1ca0518ad43fa9f1"
@@ -22,7 +22,7 @@ _UTFCPP_VERSION = "4.0.5"
 # See https://github.com/google/perfetto/issues/271#issuecomment-1527691232
 _PERFETTO_VERSION = "33.1"  # Keep in sync with docs/Development.md
 _DOCTEST_VERSION = "2.4.9"
-_DTL_VERSION = "1.20"
+_DTL_VERSION = "1.21"
 _RULES_PYTHON_VERSION = "0.18.1"
 
 def fetch_direct_dependencies():
@@ -37,17 +37,19 @@ def fetch_direct_dependencies():
 
     http_archive(
         name = "platforms",
-        sha256 = "b4a3b45dc4202e2b3e34e3bc49d2b5b37295fc23ea58d88fb9e01f3642ad9b55",
-        strip_prefix = "platforms-%s" % _PLATFORMS_COMMIT,
-        urls = ["https://github.com/bazelbuild/platforms/archive/%s.zip" % _PLATFORMS_COMMIT],
+        sha256 = "3384eb1c30762704fbe38e440204e114154086c8fc8a8c2e3e28441028c019a8",
+        urls = [
+            "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/{0}/platforms-{0}.tar.gz".format(_PLATFORMS_VERSION),
+            "https://github.com/bazelbuild/platforms/releases/download/{0}/platforms-{0}.tar.gz".format(_PLATFORMS_VERSION),
+        ],
     )
 
     http_archive(
         name = "toolchains_llvm",
-        sha256 = "b7cd301ef7b0ece28d20d3e778697a5e3b81828393150bed04838c0c52963a01",
-        strip_prefix = "toolchains_llvm-%s" % _BAZEL_TOOLCHAIN_VERSION,
+        sha256 = "2b298a1d7ea99679f5edf8af09367363e64cb9fbc46e0b7c1b1ba2b1b1b51058",
+        strip_prefix = "toolchains_llvm-v%s" % _BAZEL_TOOLCHAIN_VERSION,
         canonical_id = _BAZEL_TOOLCHAIN_VERSION,
-        url = "https://github.com/grailbio/bazel-toolchain/releases/download/{0}/toolchains_llvm-{0}.tar.gz".format(_BAZEL_TOOLCHAIN_VERSION),
+        url = "https://github.com/bazel-contrib/toolchains_llvm/releases/download/v{0}/toolchains_llvm-v{0}.tar.gz".format(_BAZEL_TOOLCHAIN_VERSION),
     )
 
     http_archive(
@@ -59,11 +61,12 @@ def fetch_direct_dependencies():
         ],
     )
 
+    _HEDRON_COMMIT = "abb61a688167623088f8768cc9264798df6a9d10"
     http_archive(
-        name = "com_grail_bazel_compdb",
-        sha256 = "d32835b26dd35aad8fd0ba0d712265df6565a3ad860d39e4c01ad41059ea7eda",
-        strip_prefix = "bazel-compilation-database-0.5.2",
-        urls = ["https://github.com/grailbio/bazel-compilation-database/archive/0.5.2.tar.gz"],
+        name = "hedron_compile_commands",
+        sha256 = "1b08abffbfbe89f6dbee6a5b33753792e8004f6a36f37c0f72115bec86e68724",
+        url = "https://github.com/hedronvision/bazel-compile-commands-extractor/archive/%s.tar.gz" % _HEDRON_COMMIT,
+        strip_prefix = "bazel-compile-commands-extractor-%s" % _HEDRON_COMMIT,
     )
 
     http_archive(
@@ -180,7 +183,7 @@ def fetch_direct_dependencies():
 
     http_archive(
         name = "dtl",
-        sha256 = "579f81bca88f4b9760a59d99c5a95bd8dd5dc2f20f33f1f9b5f64cb08979f54d",
+        sha256 = "90ed2dbf4e6d687737fe25f118bbcb6aed778cecc3f2115d191a032bf8643dbd",
         build_file = "@scip_clang//third_party:dtl.BUILD",
         strip_prefix = "dtl-%s" % _DTL_VERSION,
         urls = ["https://github.com/cubicdaiya/dtl/archive/v%s.tar.gz" % _DTL_VERSION],