Skip to content

Commit 165451f

Browse files
alexeaglefmeum
andauthored
chore: test on Bazel 9, drop Bazel 6 (#1189)
Before 3.0 final we can drop this maintenance burden --------- Co-authored-by: Fabian Meumertzheim <[email protected]>
1 parent c0f779e commit 165451f

File tree

6 files changed

+15
-22
lines changed

6 files changed

+15
-22
lines changed

.aspect/workflows/config.yaml

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,9 @@
22
workspaces:
33
- .:
44
tasks:
5-
- bazel-6:
6-
without: true
75
- bazel-7:
86
without: true
9-
- e2e/api_entries:
10-
tasks:
11-
- bazel-6:
12-
without: true
7+
- e2e/api_entries
138
- e2e/copy_action
149
- e2e/copy_to_directory
1510
- e2e/coreutils
@@ -18,19 +13,19 @@ workspaces:
1813
- e2e/write_source_files
1914
tasks:
2015
- test:
21-
name: "Test (Bazel 6.x)"
22-
id: bazel-6
23-
env:
24-
USE_BAZEL_VERSION: 6.x
25-
- test:
26-
name: "Test (Bazel 7.x)"
16+
name: Bazel 7
2717
id: bazel-7
2818
env:
2919
USE_BAZEL_VERSION: 7.x
3020
- test:
31-
name: "Test (Bazel 8.x)"
21+
name: Bazel 8
3222
id: bazel-8
3323
env:
3424
USE_BAZEL_VERSION: 8.x
25+
- test:
26+
name: Bazel 9
27+
id: bazel-9
28+
env:
29+
USE_BAZEL_VERSION: rolling
3530
notifications:
3631
github: {}

.bcr/presubmit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ bcr_test_module:
33
matrix:
44
platform: ["debian10", "macos", "ubuntu2004", "windows"]
55
bazel:
6-
- 6.x
76
- 7.x
87
- 8.x
8+
- rolling
99
tasks:
1010
run_tests:
1111
name: "Run test module"

.github/workflows/release_prep.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,16 +53,15 @@ tar --create --auto-compress \
5353

5454
cat <<EOF
5555
56-
## Using Bzlmod with Bazel 6:
56+
## Using Bzlmod
5757
58-
1. Enable with \`common --enable_bzlmod\` in \`.bazelrc\`.
59-
2. Add to your \`MODULE.bazel\` file:
58+
Add to your \`MODULE.bazel\` file:
6059
6160
\`\`\`starlark
6261
bazel_dep(name = "bazel_lib", version = "${TAG:1}")
6362
\`\`\`
6463
65-
## Using WORKSPACE
64+
## Using WORKSPACE (deprecated)
6665
6766
Paste this snippet into your \`WORKSPACE\` file:
6867

WORKSPACE.bazel

Lines changed: 0 additions & 2 deletions
This file was deleted.

lib/tests/run_binary_expansions/expansions.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ rm -f "$outfile"
77
for each in $@; do
88
sanitized=${each/darwin/PLATFORM}
99
sanitized=${sanitized/k8/PLATFORM}
10+
sanitized=${sanitized/x86_64/PLATFORM}
1011
sanitized=${sanitized/x64_windows/PLATFORM}
1112
sanitized=${sanitized/_arm64/}
1213
echo "$sanitized" >>"$outfile"

lib/tests/transitions/BUILD.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ platform(
2222
constraint_values = [
2323
"@platforms//os:linux",
2424
"@platforms//cpu:x86_64",
25-
"@io_bazel_rules_go//go/toolchain:cgo_off", # https://github.com/bazelbuild/rules_go/pull/3390
2625
],
2726
)
2827

@@ -31,7 +30,6 @@ platform(
3130
constraint_values = [
3231
"@platforms//os:linux",
3332
"@platforms//cpu:arm64",
34-
"@io_bazel_rules_go//go/toolchain:cgo_off", # https://github.com/bazelbuild/rules_go/pull/3390
3533
],
3634
)
3735

@@ -99,6 +97,7 @@ diff_test(
9997
go_binary(
10098
name = "test_transition_binary",
10199
embed = [":transitions_lib"],
100+
pure = "on",
102101
tags = ["manual"],
103102
visibility = ["//visibility:public"],
104103
)
@@ -107,6 +106,7 @@ go_test(
107106
name = "test_transition_test",
108107
size = "small",
109108
srcs = ["simple_test.go"],
109+
pure = "on",
110110
)
111111

112112
platform_transition_binary(

0 commit comments

Comments
 (0)