Skip to content

Commit fa5a29f

Browse files
authored
Fix LINUX_BINARY_PLATFORM for downstream pipeline (#2287)
Fixes https://buildkite.com/bazel/bazel-at-head-plus-downstream/builds/4656 Also made it work with linux arm64 platforms.
1 parent 0ec7b63 commit fa5a29f

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

buildkite/bazelci.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,7 @@
474474
# In order to test that "the one Linux binary" that we build for our official releases actually
475475
# works on all Linux distributions that we test on, we use the Linux binary built on our official
476476
# release platform for all Linux downstream tests.
477-
LINUX_BINARY_PLATFORM = "centos7"
477+
LINUX_BINARY_PLATFORM = "rockylinux8_arm64" if platform_module.machine() == "arm64" else "rockylinux8"
478478

479479
XCODE_VERSION_REGEX = re.compile(r"^\d+\.\d+(\.\d+)?$")
480480
XCODE_VERSION_OVERRIDES = {"10.2.1": "10.3", "11.2": "11.2.1", "11.3": "11.3.1"}
@@ -4205,8 +4205,7 @@ def upload_bazel_binaries():
42054205
try:
42064206
bazel_binary_path = download_bazel_binary(tmpdir, platform_name)
42074207
# One platform that we build on can generate binaries for multiple platforms, e.g.
4208-
# the centos7 platform generates binaries for the "centos7" platform, but also
4209-
# for the generic "linux" platform.
4208+
# the rockylinux8 platform generates binaries for all the "linux" platform.
42104209
for target_platform_name in platform["publish_binary"]:
42114210
execute_command(
42124211
[

0 commit comments

Comments
 (0)