Skip to content

Commit b7b0409

Browse files
UebelAndreUebelAndre
committed
Update CI to include MacOS arm64 and Bazel 9
1 parent 2966647 commit b7b0409

6 files changed

Lines changed: 89 additions & 37 deletions

File tree

‎.bazelci/presubmit.yml‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22
buildifier: latest
33
matrix:
44
bazel: [
5-
7.4.1,
6-
8.0.0,
7-
# TODO: re-enable last_green once bazelbuild/rules_android#328 is resolved.
8-
# last_green,
5+
7.x,
6+
8.x,
7+
9.x,
98
]
109

1110
basic_example: &basic_example
@@ -43,11 +42,16 @@ ubuntu2004: &ubuntu2004
4342
environment:
4443
ANDROID_NDK_HOME: /opt/android-ndk-r25b
4544

46-
macos: &macos
45+
macos_intel: &macos_intel
4746
platform: macos
4847
environment:
4948
ANDROID_NDK_HOME: /Users/buildkite/android-ndk-r25b
5049

50+
macos: &macos
51+
platform: macos_arm64
52+
environment:
53+
ANDROID_NDK_HOME: /Users/buildkite/android-ndk-r25b
54+
5155
windows: &windows
5256
platform: windows
5357
environment:
@@ -63,6 +67,10 @@ tasks:
6367
name: Basic Example Bzlmod
6468
bazel: ${{ bazel }}
6569
<<: [*ubuntu2004, *basic_example_bzlmod]
70+
basic_example_macos_intel:
71+
name: Basic Example
72+
bazel: ${{ bazel }}
73+
<<: [*macos_intel, *basic_example]
6674
basic_example_macos:
6775
name: Basic Example
6876
bazel: ${{ bazel }}

‎.bcr/presubmit.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
matrix:
2-
platform: ["macos", "ubuntu2004", "windows"]
3-
bazel: ["7.2.1", "7.3.x", "rolling"]
2+
platform: ["macos", "macos_arm64", "ubuntu2004", "windows"]
3+
bazel: ["7.x", "8.x", "9.x"]
44

55
tasks:
66
verify_targets_bzlmod:

‎examples/basic/MODULE.bazel‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module(name = "basic_example")
22

3-
bazel_dep(name = "platforms", version = "0.0.10")
4-
bazel_dep(name = "rules_cc", version = "0.0.17")
5-
bazel_dep(name = "rules_android_ndk", version = "0.1.2")
3+
bazel_dep(name = "platforms", version = "1.0.0")
4+
bazel_dep(name = "rules_cc", version = "0.2.4")
5+
bazel_dep(name = "rules_android_ndk", version = "0.0.0")
66
local_path_override(
77
module_name = "rules_android_ndk",
88
path = "../..",
@@ -13,7 +13,7 @@ use_repo(android_ndk_repository_extension, "androidndk")
1313

1414
register_toolchains("@androidndk//:all")
1515

16-
bazel_dep(name = "rules_android", version = "0.6.0")
16+
bazel_dep(name = "rules_android", version = "0.7.1")
1717

1818
register_toolchains(
1919
"@rules_android//toolchains/android:android_default_toolchain",

‎examples/basic/WORKSPACE‎

Lines changed: 28 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,38 @@ local_repository(
55
path = "../..",
66
)
77

8-
# rules_android and Android SDK
9-
8+
##### rules_cc setup #####
109
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
1110

11+
http_archive(
12+
name = "bazel_features",
13+
sha256 = "5d7bd1c44051cca8a9e0842eda9a5c223f2cb7264202022ff20ee77dcb3fb275",
14+
strip_prefix = "bazel_features-1.42.0",
15+
url = "https://github.com/bazel-contrib/bazel_features/releases/download/v1.42.0/bazel_features-v1.42.0.tar.gz",
16+
)
17+
18+
load("@bazel_features//:deps.bzl", "bazel_features_deps")
19+
20+
bazel_features_deps()
21+
22+
http_archive(
23+
name = "rules_cc",
24+
sha256 = "8dcd63392f0bb48adf74f413a9f39ba0fedcb8f99bf085a3b450f06d171dbb6d",
25+
strip_prefix = "rules_cc-0.2.4",
26+
url = "https://github.com/bazelbuild/rules_cc/releases/download/0.2.4/rules_cc-0.2.4.tar.gz",
27+
)
28+
29+
load("@rules_cc//cc:extensions.bzl", "compatibility_proxy_repo")
30+
31+
compatibility_proxy_repo()
32+
33+
# rules_android and Android SDK
34+
1235
http_archive(
1336
name = "rules_android",
14-
sha256 = "af84b69ab3d16dd1a41056286e6511f147a94ccea995603e13e934c915c1631c",
15-
strip_prefix = "rules_android-0.6.0",
16-
url = "https://github.com/bazelbuild/rules_android/releases/download/v0.6.0/rules_android-v0.6.0.tar.gz",
37+
sha256 = "7c45b6aaa837fb6f2f23ad11387638cb00fa9f839a04ec564caac70a543a9cd5",
38+
strip_prefix = "rules_android-0.7.1",
39+
url = "https://github.com/bazelbuild/rules_android/releases/download/v0.7.1/rules_android-v0.7.1.tar.gz",
1740
)
1841

1942
# Android rules dependencies
@@ -63,14 +86,6 @@ register_toolchains(
6386
"@rules_android//toolchains/android_sdk:android_sdk_tools",
6487
)
6588

66-
##### rules_cc setup #####
67-
http_archive(
68-
name = "rules_cc",
69-
sha256 = "abc605dd850f813bb37004b77db20106a19311a96b2da1c92b789da529d28fe1",
70-
strip_prefix = "rules_cc-0.0.17",
71-
urls = ["https://github.com/bazelbuild/rules_cc/releases/download/0.0.17/rules_cc-0.0.17.tar.gz"],
72-
)
73-
7489
# --SNIP--: Everything below this lines goes into the example WORKSPACE snippet in the release notes.
7590
load("@rules_android_ndk//:rules.bzl", "android_ndk_repository")
7691

‎examples/cpu_features/MODULE.bazel‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
module(
2+
name = "cpu_features_example",
3+
)
4+
5+
bazel_dep(name = "platforms", version = "1.0.0")
6+
bazel_dep(name = "rules_cc", version = "0.2.4")
7+
bazel_dep(name = "rules_android_ndk", version = "0.0.0")
8+
local_path_override(
9+
module_name = "rules_android_ndk",
10+
path = "../..",
11+
)
12+
13+
android_ndk_repository_extension = use_extension("@rules_android_ndk//:extension.bzl", "android_ndk_repository_extension")
14+
use_repo(android_ndk_repository_extension, "androidndk")
15+
16+
register_toolchains("@androidndk//:all")

‎examples/cpu_features/WORKSPACE‎

Lines changed: 26 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,38 @@ local_repository(
55
path = "../..",
66
)
77

8-
# rules_android and Android SDK
9-
8+
##### rules_cc setup #####
109
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
1110

11+
http_archive(
12+
name = "bazel_features",
13+
sha256 = "5d7bd1c44051cca8a9e0842eda9a5c223f2cb7264202022ff20ee77dcb3fb275",
14+
strip_prefix = "bazel_features-1.42.0",
15+
url = "https://github.com/bazel-contrib/bazel_features/releases/download/v1.42.0/bazel_features-v1.42.0.tar.gz",
16+
)
17+
18+
load("@bazel_features//:deps.bzl", "bazel_features_deps")
19+
20+
bazel_features_deps()
21+
22+
http_archive(
23+
name = "rules_cc",
24+
sha256 = "8dcd63392f0bb48adf74f413a9f39ba0fedcb8f99bf085a3b450f06d171dbb6d",
25+
strip_prefix = "rules_cc-0.2.4",
26+
url = "https://github.com/bazelbuild/rules_cc/releases/download/0.2.4/rules_cc-0.2.4.tar.gz",
27+
)
28+
29+
load("@rules_cc//cc:extensions.bzl", "compatibility_proxy_repo")
30+
31+
compatibility_proxy_repo()
32+
1233
# rules_android and Android SDK
1334

1435
http_archive(
1536
name = "rules_android",
16-
sha256 = "af84b69ab3d16dd1a41056286e6511f147a94ccea995603e13e934c915c1631c",
17-
strip_prefix = "rules_android-0.6.0",
18-
url = "https://github.com/bazelbuild/rules_android/releases/download/v0.6.0/rules_android-v0.6.0.tar.gz",
37+
sha256 = "7c45b6aaa837fb6f2f23ad11387638cb00fa9f839a04ec564caac70a543a9cd5",
38+
strip_prefix = "rules_android-0.7.1",
39+
url = "https://github.com/bazelbuild/rules_android/releases/download/v0.7.1/rules_android-v0.7.1.tar.gz",
1940
)
2041

2142
# Android rules dependencies
@@ -65,14 +86,6 @@ register_toolchains(
6586
"@rules_android//toolchains/android_sdk:android_sdk_tools",
6687
)
6788

68-
##### rules_cc setup #####
69-
http_archive(
70-
name = "rules_cc",
71-
sha256 = "abc605dd850f813bb37004b77db20106a19311a96b2da1c92b789da529d28fe1",
72-
strip_prefix = "rules_cc-0.0.17",
73-
urls = ["https://github.com/bazelbuild/rules_cc/releases/download/0.0.17/rules_cc-0.0.17.tar.gz"],
74-
)
75-
7689
# --SNIP--: Everything below this lines goes into the example WORKSPACE snippet in the release notes.
7790
load("@rules_android_ndk//:rules.bzl", "android_ndk_repository")
7891

0 commit comments

Comments
 (0)