Skip to content

Commit 2b9b101

Browse files
Remove test platform specification from release config (#20475)
PiperOrigin-RevId: 731061065
1 parent 90e893c commit 2b9b101

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

.github/workflows/test_cpp.yml

+4
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@ jobs:
5252
cache_key: TcMalloc
5353
image: "us-docker.pkg.dev/protobuf-build/containers/test/linux/tcmalloc:7.1.2-d9624f2aa83cba3eaf906f751d75b36aacb9aa82"
5454
targets: "//src/... //third_party/utf8_range/..."
55+
- config: { name: "aarch64", flags: "--platforms=//build_defs:aarch64_linux" }
56+
cache_key: aarch64-bazel7
57+
targets: "//src/... //src/google/protobuf/compiler:protoc_aarch64_test //third_party/utf8_range/..."
58+
image: "us-docker.pkg.dev/protobuf-build/containers/test/linux/emulation:7.1.2-aarch64-2920199ab0090ed427413a8e422e62695c8392a8"
5559
name: ${{ matrix.config.continuous-only && inputs.continuous-prefix || '' }} Linux ${{ matrix.config.name }}
5660
runs-on: ${{ matrix.config.runner || 'ubuntu-latest' }}
5761
steps:

toolchain/toolchains.bazelrc

+2-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@ build:cross_config --//toolchain:release=true
33
build:cross_config --host_crosstool_top=@bazel_tools//tools/cpp:toolchain
44
build:cross_config --incompatible_enable_cc_toolchain_resolution=false
55

6-
# Set platform explicitly for aarch64 emulation images.
7-
build:linux-aarch_64 --config=cross_config --cpu=linux-aarch_64 --platforms=//build_defs:aarch64_linux
8-
build:linux-aarch64 --config=cross_config --cpu=linux-aarch_64 --platforms=//build_defs:aarch64_linux
6+
build:linux-aarch_64 --config=cross_config --cpu=linux-aarch_64
7+
build:linux-aarch64 --config=cross_config --cpu=linux-aarch_64
98
build:linux-ppcle_64 --config=cross_config --cpu=linux-ppcle_64
109
build:linux-ppc64le --config=cross_config --cpu=linux-ppcle_64
1110
build:linux-s390_64 --config=cross_config --cpu=linux-s390_64

0 commit comments

Comments
 (0)