chore: upgrade to Bazel 8 (#182)

bazel-contrib · Dec 22, 2024 · e7ba24b · e7ba24b
1 parent e407c18
commit e7ba24b
Show file tree

Hide file tree

Showing 15 changed files with 63 additions and 136 deletions.
diff --git a/.bazelversion b/.bazelversion
@@ -1 +1 @@
-7.4.1
+8.0.0
diff --git a/.bcr/presubmit.yml b/.bcr/presubmit.yml
@@ -2,7 +2,7 @@
 bcr_test_module:
   module_path: "examples/gem"
   matrix:
-    bazel: ["7.x", "6.x"]
+    bazel: ["8.x", "7.x", "6.x"]
     # NB: Windows is removed due to https://github.com/bazel-contrib/rules_ruby/issues/64
     platform: ["debian10", "macos", "ubuntu2004"]
   tasks:

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: bazel-contrib/setup-bazel@0.9.1
+      - uses: bazel-contrib/setup-bazel@0.10.0
         with:
           bazelrc: common --announce_rc --color=yes
           repository-cache: true
@@ -53,11 +53,6 @@ jobs:
           # Previews are unavailable on Windows.
           - os: windows-latest
             ruby: 3.4.0-preview2
-          # JRuby with bzlmod fails with long path issues on Windows.
-          # See #64
-          - os: windows-latest
-            ruby: jruby-9.4.9.0
-            mode: bzlmod
           # TruffleRuby doesn't work on Windows.
           - os: windows-latest
             ruby: truffleruby-24.1.1
@@ -66,9 +61,11 @@ jobs:
         working-directory: examples/gem
     steps:
       - uses: actions/checkout@v4
-      - uses: bazel-contrib/setup-bazel@0.9.1
+      - uses: bazel-contrib/setup-bazel@0.10.0
         with:
-          bazelrc: common --announce_rc --color=yes ${{ matrix.mode == 'WORKSPACE' && '--noenable_bzlmod' || '' }}
+          bazelrc: common --announce_rc --color=yes ${{ matrix.mode == 'WORKSPACE' && '--enable_workspace' || '' }}
+          # Workaround for long path issues: https://github.com/jruby/jruby/issues/3995.
+          output-base: ${{ matrix.os == 'windows-latest' && 'D:/b' || '' }}
           repository-cache: examples/gem/${{ matrix.mode == 'WORKSPACE' && 'WORKSPACE' || 'MODULE.bazel' }}
       - run: echo ${{ matrix.ruby }} > .ruby-version
       - if: matrix.ruby == 'system'
@@ -102,7 +99,7 @@ jobs:
         working-directory: examples/jekyll
     steps:
       - uses: actions/checkout@v4
-      - uses: bazel-contrib/setup-bazel@0.9.1
+      - uses: bazel-contrib/setup-bazel@0.10.0
         with:
           bazelrc: common --announce_rc --color=yes
           repository-cache: examples/jekyll/MODULE.bazel

diff --git a/.github/workflows/release_prep.sh b/.github/workflows/release_prep.sh
@@ -15,7 +15,7 @@ SHA=$(shasum -a 256 $ARCHIVE | awk '{print $1}')
 
 # The stdout of this program will be used as the top of the release notes for this release.
 cat << EOF
-## Using Bzlmod with Bazel 7
+## Using Bzlmod with Bazel 7-8
 
 1. Add to your \`MODULE.bazel\` file:
 

diff --git a/BUILD b/BUILD
@@ -1,5 +1,5 @@
-load("@bazel_gazelle//:def.bzl", "gazelle", "gazelle_binary")
 load("@buildifier_prebuilt//:rules.bzl", "buildifier")
+load("@gazelle//:def.bzl", "gazelle", "gazelle_binary")
 
 gazelle_binary(
     name = "gazelle_bin",

diff --git a/MODULE.bazel b/MODULE.bazel
@@ -13,4 +13,15 @@ module(
 bazel_dep(name = "bazel_skylib", version = "1.3.0")
 bazel_dep(name = "platforms", version = "0.0.5")
 
+# Ruleset development dependencies.
+bazel_dep(name = "aspect_bazel_lib", version = "2.10.0", dev_dependency = True)
+bazel_dep(name = "bazel_skylib_gazelle_plugin", version = "1.5.0", dev_dependency = True)
+bazel_dep(name = "buildifier_prebuilt", version = "7.3.1", dev_dependency = True)
+bazel_dep(name = "gazelle", version = "0.40.0", dev_dependency = True)
+bazel_dep(name = "rules_go", version = "0.51.0", dev_dependency = True)
+bazel_dep(name = "stardoc", version = "0.7.2", dev_dependency = True)
+
+go_sdk = use_extension("@rules_go//go:extensions.bzl", "go_sdk", dev_dependency = True)
+go_sdk.download(version = "1.23.1")
+
 # TODO: should we register any toolchain by default?
diff --git a/README.md b/README.md
@@ -6,7 +6,8 @@ This repository hosts [Ruby][1] language ruleset for [Bazel][2].
 
 The ruleset is known to work with:
 
-- Bazel 7 using WORKSPACE and Bzlmod *(tested on CI)*;
+- Bazel 8 using WORKSPACE and Bzlmod *(tested on CI)*;
+- Bazel 7 using WORKSPACE and Bzlmod *(no longer tested on CI)*;
 - Bazel 6 using WORKSPACE and Bzlmod *(no longer tested on CI)*;
 - Bazel 5 using WORKSPACE *(no longer tested on CI)*.
 

diff --git a/WORKSPACE b/WORKSPACE
diff --git a/docs/repository_rules.md b/docs/repository_rules.md
diff --git a/docs/rules.md b/docs/rules.md
diff --git a/examples/gem/.aspect/bazelrc/correctness.bazelrc b/examples/gem/.aspect/bazelrc/correctness.bazelrc
@@ -48,10 +48,10 @@ build --incompatible_strict_action_env
 # Without this option, you rely on rules authors to manually check the tags you passed
 # and apply relevant ones to the actions they create.
 # See https://github.com/bazelbuild/bazel/issues/8830 for details.
-# Docs: https://bazel.build/reference/command-line-reference#flag--experimental_allow_tags_propagation
-build --experimental_allow_tags_propagation
-fetch --experimental_allow_tags_propagation
-query --experimental_allow_tags_propagation
+# Docs: https://bazel.build/reference/command-line-reference#flag--incompatible_allow_tags_propagation
+build --incompatible_allow_tags_propagation
+fetch --incompatible_allow_tags_propagation
+query --incompatible_allow_tags_propagation
 
 # Do not automatically create `__init__.py` files in the runfiles of Python targets. Fixes the wrong
 # default that comes from Google's internal monorepo by using `__init__.py` to delimit a Python

diff --git a/examples/gem/Gemfile.lock b/examples/gem/Gemfile.lock
@@ -75,6 +75,7 @@ GEM
 
 PLATFORMS
   arm64-darwin-23
+  arm64-darwin-24
   java
   ruby
   universal-java-1.8

diff --git a/examples/jekyll/BUILD b/examples/jekyll/BUILD
@@ -5,10 +5,13 @@ package(default_visibility = ["//visibility:public"])
 
 filegroup(
     name = "sources",
-    srcs = glob([
-        "_posts/**/*",
-        "_layouts/**/*",
-    ]) + [
+    srcs = glob(
+        [
+            "_posts/**/*",
+            "_layouts/**/*",
+        ],
+        allow_empty = True,
+    ) + [
         "404.html",
         "about.md",
         "index.md",

diff --git a/examples/jekyll/Gemfile.lock b/examples/jekyll/Gemfile.lock
@@ -67,6 +67,7 @@ GEM
 
 PLATFORMS
   arm64-darwin-23
+  arm64-darwin-24
   x86_64-darwin-21
   x86_64-linux
 

diff --git a/examples/jekyll/MODULE.bazel b/examples/jekyll/MODULE.bazel
@@ -1,7 +1,7 @@
 "Bazel dependencies"
 
 bazel_dep(name = "bazel_skylib", version = "1.5.0", dev_dependency = True)
-bazel_dep(name = "aspect_bazel_lib", version = "2.3.0", dev_dependency = True)
+bazel_dep(name = "aspect_bazel_lib", version = "2.9.4", dev_dependency = True)
 bazel_dep(name = "rules_ruby", version = "0.0.0", dev_dependency = True)
 local_path_override(
     module_name = "rules_ruby",