Skip to content

Commit b1b5ca0

Browse files
keithcopybara-github
authored andcommitted
Enumerate more CI targets
Copybara Import from #560 BEGIN_PUBLIC Enumerate more CI targets (#560) CI was testing 6.x as the lowest supported version, but not 7.x, also when 9.x was released without a change like this it would have stopped testing 8.x Closes #560 END_PUBLIC COPYBARA_INTEGRATE_REVIEW=#560 from keith:ks/enumerate-more-ci-targets 15f31da PiperOrigin-RevId: 857401968 Change-Id: I756c7989f347c67b7787fc4bf194fa7b4b593e6b
1 parent e0bcd3c commit b1b5ca0

1 file changed

Lines changed: 64 additions & 20 deletions

File tree

.bazelci/presubmit.yml

Lines changed: 64 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -42,26 +42,6 @@ tasks:
4242
- "//docs/..."
4343
- "-//docs:toolchain_api_diff_test" # Bazel adds loads statements in examples
4444

45-
# Bazel LTS
46-
ubuntu2004:
47-
name: Ubuntu 20.04 (Bazel LTS)
48-
build_targets: *build_targets
49-
test_targets: *test_targets
50-
macos:
51-
name: MacOS (Bazel LTS)
52-
build_targets: *build_targets
53-
test_targets: *test_targets
54-
windows:
55-
name: Windows (Bazel LTS)
56-
build_targets: *build_targets
57-
test_targets: *test_targets
58-
ubuntu_bzlmod:
59-
name: Ubuntu 20.04 (Bazel LTS, bzlmod)
60-
platform: ubuntu2004
61-
build_flags:
62-
- "--enable_bzlmod"
63-
- "--ignore_dev_dependency"
64-
6545
# Bazel@HEAD
6646
ubuntu2004_head:
6747
name: Ubuntu 20.04 (Bazel HEAD)
@@ -132,6 +112,70 @@ tasks:
132112
build_targets: *build_targets_bazel_6
133113
test_targets: *test_targets_bazel_6
134114

115+
# Bazel 7
116+
ubuntu2004_bazel_7:
117+
name: Ubuntu 20.04 (Bazel 7)
118+
bazel: 7.x
119+
platform: ubuntu2004
120+
build_targets: *build_targets_bazel_6
121+
test_targets: *test_targets_bazel_6
122+
macos_bazel_7:
123+
name: MacOS (Bazel 7)
124+
bazel: 7.x
125+
platform: macos
126+
build_targets: *build_targets_bazel_6
127+
test_targets: *test_targets_bazel_6
128+
windows_bazel_7:
129+
name: Windows (Bazel 7)
130+
bazel: 7.x
131+
platform: windows
132+
build_targets: *build_targets_bazel_6
133+
test_targets: *test_targets_bazel_6
134+
135+
# Bazel 8
136+
ubuntu2004_bazel_8:
137+
name: Ubuntu 20.04 (Bazel 8)
138+
bazel: 8.x
139+
platform: ubuntu2004
140+
build_targets: *build_targets_bazel_6
141+
test_targets: *test_targets_bazel_6
142+
macos_bazel_8:
143+
name: MacOS (Bazel 8)
144+
bazel: 8.x
145+
platform: macos
146+
build_targets: *build_targets_bazel_6
147+
test_targets: *test_targets_bazel_6
148+
windows_bazel_8:
149+
name: Windows (Bazel 8)
150+
bazel: 8.x
151+
platform: windows
152+
build_targets: *build_targets_bazel_6
153+
test_targets: *test_targets_bazel_6
154+
155+
# Bazel 9
156+
ubuntu2004:
157+
name: Ubuntu 20.04 (Bazel LTS)
158+
bazel: last_rc # TODO: change to 9.x when released
159+
build_targets: *build_targets
160+
test_targets: *test_targets
161+
macos:
162+
name: MacOS (Bazel LTS)
163+
bazel: last_rc # TODO: change to 9.x when released
164+
build_targets: *build_targets
165+
test_targets: *test_targets
166+
windows:
167+
name: Windows (Bazel LTS)
168+
bazel: last_rc # TODO: change to 9.x when released
169+
build_targets: *build_targets
170+
test_targets: *test_targets
171+
ubuntu_bzlmod:
172+
name: Ubuntu 20.04 (Bazel LTS, bzlmod)
173+
bazel: last_rc # TODO: change to 9.x when released
174+
platform: ubuntu2004
175+
build_flags:
176+
- "--enable_bzlmod"
177+
- "--ignore_dev_dependency"
178+
135179
ubuntu_rule_based_toolchains:
136180
name: Ubuntu rule-based toolchains
137181
platform: ubuntu1804

0 commit comments

Comments
 (0)