Skip to content

Commit 60515a1

Browse files
authored
Update macos presubmit runners to macos_arm64 (#3000)
1 parent 6a66388 commit 60515a1

File tree

2 files changed

+16
-15
lines changed

2 files changed

+16
-15
lines changed

.bazelci/presubmit.yml

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ tasks:
8888
build_targets: *default_linux_targets
8989
test_targets: *default_linux_targets
9090
macos:
91+
platform: macos_arm64
9192
build_targets: *default_macos_targets
9293
test_targets: *default_macos_targets
9394
coverage_targets: *default_macos_targets
@@ -112,7 +113,7 @@ tasks:
112113
post_shell_commands: *coverage_validation_post_shell_commands
113114
macos_split_coverage_postprocessing:
114115
name: Split Coverage Postprocessing
115-
platform: macos
116+
platform: macos_arm64
116117
shell_commands: *split_coverage_postprocessing_shell_commands
117118
coverage_targets: *default_macos_targets
118119
post_shell_commands: *coverage_validation_post_shell_commands
@@ -127,7 +128,7 @@ tasks:
127128
- "--compilation_mode=opt"
128129
macos_opt:
129130
name: Opt Mode
130-
platform: macos
131+
platform: macos_arm64
131132
build_targets: *default_macos_targets
132133
test_targets: *default_macos_targets
133134
build_flags:
@@ -173,15 +174,15 @@ tasks:
173174
bazel: "rolling"
174175
macos_with_aspects:
175176
name: With Aspects
176-
platform: macos
177+
platform: macos_arm64
177178
build_flags: *aspects_flags
178179
build_targets: *default_macos_targets
179180
test_targets: *default_macos_targets
180181
coverage_targets: *default_macos_targets
181182
post_shell_commands: *coverage_validation_post_shell_commands
182183
macos_rolling_with_aspects:
183184
name: "Macos Rolling Bazel Version With Aspects"
184-
platform: macos
185+
platform: macos_arm64
185186
build_flags: *aspects_flags
186187
build_targets: *default_macos_targets
187188
test_targets: *default_macos_targets
@@ -455,7 +456,7 @@ tasks:
455456
build_flags: *aspects_flags
456457
macos_examples:
457458
name: Examples
458-
platform: macos
459+
platform: macos_arm64
459460
working_directory: examples
460461
build_targets:
461462
- "//..."
@@ -528,7 +529,7 @@ tasks:
528529
build_flags: *aspects_flags
529530
crate_universe_examples_macos:
530531
name: Crate Universe Examples
531-
platform: macos
532+
platform: macos_arm64
532533
working_directory: examples/crate_universe
533534
run_targets: *crate_universe_vendor_example_targets
534535
build_targets:
@@ -538,7 +539,7 @@ tasks:
538539
build_flags: *aspects_flags
539540
crate_universe_unnamed_examples_macos:
540541
name: Crate Universe Unnamed Examples
541-
platform: macos
542+
platform: macos_arm64
542543
working_directory: examples/crate_universe_unnamed
543544
run_targets: *crate_universe_unnamed_vendor_example_targets
544545
build_targets:
@@ -660,7 +661,7 @@ tasks:
660661
ANDROID_NDK_HOME: /opt/android-ndk-r25b
661662
android_examples_macos:
662663
name: Android Examples
663-
platform: macos
664+
platform: macos_arm64
664665
working_directory: examples/android
665666
build_flags:
666667
- "--incompatible_enable_android_toolchain_resolution"
@@ -675,13 +676,13 @@ tasks:
675676
ANDROID_NDK_HOME: /Users/buildkite/android-ndk-r25b
676677
ios_examples:
677678
name: iOS Examples
678-
platform: macos
679+
platform: macos_arm64
679680
working_directory: examples/ios
680681
build_targets:
681682
- "//..."
682683
ios_build:
683684
name: iOS build script cross compile test
684-
platform: macos
685+
platform: macos_arm64
685686
working_directory: examples/ios_build
686687
test_flags:
687688
- "--cpu=ios_x86_64"
@@ -697,7 +698,7 @@ tasks:
697698
# - "//..."
698699
musl_cross_compiling_macos_to_linux:
699700
name: Musl cross compiling test from macOS to Linux
700-
platform: macos
701+
platform: macos_arm64
701702
working_directory: examples/musl_cross_compiling
702703
build_targets:
703704
- "//..."
@@ -754,7 +755,7 @@ tasks:
754755
- "//..."
755756
macos_bzlmod_cross_compile:
756757
name: Cross compilation with bzlmod on macOS
757-
platform: macos
758+
platform: macos_arm64
758759
working_directory: examples/bzlmod/cross_compile
759760
build_targets:
760761
- "//:all"
@@ -790,7 +791,7 @@ tasks:
790791
- "//..."
791792
macos_bzlmod_bcr:
792793
name: bzlmod BCR presubmit
793-
platform: macos
794+
platform: macos_arm64
794795
working_directory: examples/bzlmod/hello_world
795796
test_flags: *bzlmod_flags
796797
run_targets:
@@ -828,7 +829,7 @@ tasks:
828829
# A newer version than is specified in the .bazel_version file is needed for
829830
# --incompatible_use_plus_in_repo_names'
830831
bazel: *minimum_bazel_version
831-
platform: macos
832+
platform: macos_arm64
832833
working_directory: examples/bzlmod/hello_world
833834
test_flags: *bzlmod_plus_repo_names_flags
834835
run_targets:

.bcr/presubmit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
bcr_test_module:
22
module_path: ""
33
matrix:
4-
platform: ["macos", "ubuntu2004"]
4+
platform: ["macos_arm64", "ubuntu2004"]
55
bazel: ["6.x", "7.x"]
66
tasks:
77
run_tests:

0 commit comments

Comments
 (0)