Skip to content

Commit 4e9e0c7

Browse files
authored
Disable mac CI, update Linux (#4220)
While bazelbuild/continuous-integration#2153 is still on going, this PR temporarily disable the failing macOS CI task, so the master branch is green While I am on it, I also updated * The main Linux platform to ubuntu2404 * Bazel 6 test to use Debian 11 because Ubuntu 1804 is already EOF. Debian 11 is old enough to support Bazel 6 but still continue to receive security fixes * rbe_ubuntu1604 to rbe_ubuntu2404 * all new MacBooks in the past 4 years are using ARM64. We can safely stop testing Intel Mac now
1 parent 623f600 commit 4e9e0c7

File tree

1 file changed

+22
-23
lines changed

1 file changed

+22
-23
lines changed

.bazelci/presubmit.yml

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
---
22
matrix:
33
platform:
4-
- ubuntu2004
5-
- macos
4+
- ubuntu2404
65
- macos_arm64
76
- windows
87

98
tasks:
10-
ubuntu1804_bazel6:
11-
platform: ubuntu1804
9+
debian11_bazel6:
10+
platform: debian11
1211
bazel: 6.5.0 # test minimum supported version of bazel
1312
build_targets:
1413
- "//..."
@@ -21,7 +20,7 @@ tasks:
2120
- "-//tests/runfiles:runfiles_test"
2221
# TODO: Investigate why this fails.
2322
- "-//tests/core/starlark/cgo:missing_cc_toolchain_explicit_pure_off_test"
24-
ubuntu2004:
23+
ubuntu2404:
2524
# enable some unflipped incompatible flags on this platform to ensure we don't regress.
2625
build_flags:
2726
- "--config=incompatible"
@@ -72,21 +71,21 @@ tasks:
7271
- "@go_default_sdk//..."
7372
test_targets:
7473
- "//..."
75-
macos_arm64:
76-
build_flags:
77-
- "--apple_crosstool_top=@local_config_apple_cc//:toolchain"
78-
- "--crosstool_top=@local_config_apple_cc//:toolchain"
79-
- "--host_crosstool_top=@local_config_apple_cc//:toolchain"
80-
build_targets:
81-
- "//..."
82-
- "--"
83-
test_flags:
84-
- "--apple_crosstool_top=@local_config_apple_cc//:toolchain"
85-
- "--crosstool_top=@local_config_apple_cc//:toolchain"
86-
- "--host_crosstool_top=@local_config_apple_cc//:toolchain"
87-
test_targets:
88-
- "//..."
89-
rbe_ubuntu1604:
74+
# macos_arm64:
75+
# build_flags:
76+
# - "--apple_crosstool_top=@local_config_apple_cc//:toolchain"
77+
# - "--crosstool_top=@local_config_apple_cc//:toolchain"
78+
# - "--host_crosstool_top=@local_config_apple_cc//:toolchain"
79+
# build_targets:
80+
# - "//..."
81+
# - "--"
82+
# test_flags:
83+
# - "--apple_crosstool_top=@local_config_apple_cc//:toolchain"
84+
# - "--crosstool_top=@local_config_apple_cc//:toolchain"
85+
# - "--host_crosstool_top=@local_config_apple_cc//:toolchain"
86+
# test_targets:
87+
# - "//..."
88+
rbe_ubuntu2404:
9089
build_targets:
9190
- "//..."
9291
test_flags:
@@ -179,7 +178,7 @@ tasks:
179178
# The following configurations test a seperate WORKSPACE under the examples folder
180179
ubuntu2004_examples:
181180
name: Examples test on Ubuntu
182-
platform: ubuntu2004
181+
platform: ubuntu2404
183182
working_directory: examples/basic-gazelle
184183
build_flags:
185184
- "--config=incompatible"
@@ -190,8 +189,8 @@ tasks:
190189
test_targets:
191190
- "//..."
192191
macos_examples:
193-
name: Examples test on MacOS
194-
platform: macos
192+
name: Examples test on macOS
193+
platform: macos_arm64
195194
working_directory: examples/basic-gazelle
196195
build_flags:
197196
- "--config=incompatible"

0 commit comments

Comments
 (0)