Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .bazelversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.6.0
7.7.1
2 changes: 1 addition & 1 deletion .bcr/presubmit.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
bcr_test_module:
module_path: 'e2e/smoke'
matrix:
bazel: ['7.x', '6.x']
bazel: ['7.x', '8.x', '9.x']
platform: ['debian10', 'macos', 'ubuntu2004', 'windows']
tasks:
run_tests:
Expand Down
22 changes: 19 additions & 3 deletions .github/workflows/ci-vanilla-bazel.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ jobs:
m=${v::1}
a=(
"major:$m, version:\"$v\""
"major:8, version:\"8.7.0\""
"major:9, version:\"9.1.1\""
)
printf -v j '{%s},' "${a[@]}"
echo "res=[${j%,}]" | tee -a $GITHUB_OUTPUT
Expand Down Expand Up @@ -58,14 +60,28 @@ jobs:
# Root workspace is only bzlmod
- folder: .
bzlmod: 0
# Don't test MacOS and Windows against secondary bazel version to minimize minutes (billed at 10X and 2X respectively)
# WORKSPACE is disabled by default in Bazel 8 and removed in Bazel 9,
# so only test WORKSPACE mode on the primary (Bazel 7) version
- bzlmod: 0
bazel-version:
major: 8
- bzlmod: 0
bazel-version:
major: 9
# Don't test MacOS and Windows against secondary bazel versions to minimize minutes (billed at 10X and 2X respectively)
# https://docs.github.com/en/billing/managing-billing-for-github-actions/about-billing-for-github-actions#included-storage-and-minutes
- os: macos
bazel-version:
major: 6
major: 8
- os: macos
bazel-version:
major: 9
- os: windows
bazel-version:
major: 8
- os: windows
bazel-version:
major: 6
major: 9
# Linux on the primary bazel version is tested on Aspect Workflows
- os: ubuntu
bazel-version:
Expand Down
9 changes: 9 additions & 0 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

module(
name = "aspect_rules_terser",
bazel_compatibility = [">=7.0.0"],
compatibility_level = 1,
)

Expand All @@ -21,6 +22,14 @@ bazel_dep(name = "aspect_rules_lint", version = "2.6.0", dev_dependency = True)
bazel_dep(name = "bazelrc-preset.bzl", version = "1.9.2", dev_dependency = True)
bazel_dep(name = "buildifier_prebuilt", version = "8.5.1.2", dev_dependency = True)

# Transitive dep of aspect_rules_js; older versions resolved by the 2.0.0
# lower-bound fail on Bazel 9 (removed `incompatible_use_toolchain_transition`).
bazel_dep(name = "rules_nodejs", version = "6.7.4", dev_dependency = True)

# Transitive dep of aspect_rules_lint's gazelle; the 0.42.0 it resolves
# fails on Bazel 9 (native CcInfo symbol removed).
bazel_dep(name = "rules_go", version = "0.61.1", dev_dependency = True)

npm = use_extension("@aspect_rules_js//npm:extensions.bzl", "npm", dev_dependency = True)
npm.npm_translate_lock(
name = "npm",
Expand Down
4 changes: 4 additions & 0 deletions e2e/smoke/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ local_path_override(
bazel_dep(name = "aspect_rules_js", version = "2.0.0", dev_dependency = True)
bazel_dep(name = "aspect_bazel_lib", version = "2.19.3", dev_dependency = True)

# Transitive dep of aspect_rules_js; older versions resolved by the 2.0.0
# lower-bound fail on Bazel 9 (removed `incompatible_use_toolchain_transition`).
bazel_dep(name = "rules_nodejs", version = "6.7.4", dev_dependency = True)

npm = use_extension("@aspect_rules_js//npm:extensions.bzl", "npm", dev_dependency = True)
npm.npm_translate_lock(
name = "npm",
Expand Down
5 changes: 4 additions & 1 deletion tools/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,8 @@ load("@bazelrc-preset.bzl", "bazelrc_preset")

bazelrc_preset(
name = "preset",
tags = ["skip-on-bazel6"],
tags = [
"skip-on-bazel8",
"skip-on-bazel9",
],
)
Loading