Skip to content

Remove test platform specification from release config #20475

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mkruskal-google merged 1 commit into from
Feb 26, 2025
Merged

Remove test platform specification from release config #20475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/workflows/test_cpp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@ jobs:
cache_key: TcMalloc
image: "us-docker.pkg.dev/protobuf-build/containers/test/linux/tcmalloc:7.1.2-d9624f2aa83cba3eaf906f751d75b36aacb9aa82"
targets: "//src/... //third_party/utf8_range/..."
- config: { name: "aarch64", flags: "--platforms=//build_defs:aarch64_linux" }
cache_key: aarch64-bazel7
targets: "//src/... //src/google/protobuf/compiler:protoc_aarch64_test //third_party/utf8_range/..."
image: "us-docker.pkg.dev/protobuf-build/containers/test/linux/emulation:7.1.2-aarch64-2920199ab0090ed427413a8e422e62695c8392a8"
name: ${{ matrix.config.continuous-only && inputs.continuous-prefix || '' }} Linux ${{ matrix.config.name }}
runs-on: ${{ matrix.config.runner || 'ubuntu-latest' }}
steps:
Expand Down
5 changes: 2 additions & 3 deletions toolchain/toolchains.bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@ build:cross_config --//toolchain:release=true
build:cross_config --host_crosstool_top=@bazel_tools//tools/cpp:toolchain
build:cross_config --incompatible_enable_cc_toolchain_resolution=false

# Set platform explicitly for aarch64 emulation images.
build:linux-aarch_64 --config=cross_config --cpu=linux-aarch_64 --platforms=//build_defs:aarch64_linux
build:linux-aarch64 --config=cross_config --cpu=linux-aarch_64 --platforms=//build_defs:aarch64_linux
build:linux-aarch_64 --config=cross_config --cpu=linux-aarch_64
build:linux-aarch64 --config=cross_config --cpu=linux-aarch_64
build:linux-ppcle_64 --config=cross_config --cpu=linux-ppcle_64
build:linux-ppc64le --config=cross_config --cpu=linux-ppcle_64
build:linux-s390_64 --config=cross_config --cpu=linux-s390_64
Expand Down