Skip to content

Commit 0db1d6b

Browse files
committed
enable builds on macos x86_64 and aarch64 runners
1 parent 78f5b15 commit 0db1d6b

File tree

2 files changed

+19
-5
lines changed

2 files changed

+19
-5
lines changed

.github/workflows/build.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,13 @@ jobs:
7474
- os: windows-2022
7575
cpu: x64_x86_windows
7676
bazel_target: dist_zip
77-
# disabling Mac OS releases for now since they are working through existing build process
78-
# - os: macos-11
79-
# cpu: darwin_arm64
80-
# - os: macos-11
81-
# cpu: darwin_x86_64
77+
- os: macos-14
78+
cpu: darwin_arm64
79+
bazel_target: dist_zip
80+
- os: macos-13
81+
cpu: darwin_x86_64
82+
bazel_target: dist_zip
83+
8284

8385
steps:
8486
- uses: actions/checkout@v4

BUILD.bazel

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,24 @@ config_setting(
2121
values = {"cpu": "k8"},
2222
)
2323

24+
config_setting(
25+
name = "darwin_arm64",
26+
values = {"cpu": "darwin_arm64"},
27+
)
28+
29+
config_setting(
30+
name = "darwin_x86_64",
31+
values = {"cpu": "darwin_x86_64"},
32+
)
33+
2434
package_naming(
2535
name = "protobuf_javascript_pkg_naming",
2636
platform = select({
2737
":k8": "linux-x86_64", # currently the only supported build type in Github Actions
2838
":x64_x86_windows": "win32",
2939
":x64_windows": "win64",
40+
":darwin_arm64": "osx-aarch_64",
41+
":darwin_x86_64": "osx-x86_64",
3042
"//conditions:default": "" # continues with current behavior when no --cpu is specified allowing existing internal builds to function
3143
})
3244
)

0 commit comments

Comments
 (0)