Skip to content

Re-enable aarch64 tests. #20853

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
merged 2 commits into from
Mar 26, 2025
Merged

Re-enable aarch64 tests. #20853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac51572
Re-enable aarch64 tests.
mkruskal-google Mar 26, 2025
a124417
Fix bazel image in php
mkruskal-google Mar 26, 2025
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
3 changes: 1 addition & 2 deletions .github/workflows/test_cpp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,7 @@ jobs:
strategy:
fail-fast: false # Don't cancel all jobs if one fails.
matrix:
# TODO: Re-enable once aarch64 is fixed.
arch: [x86_64]
arch: [x86_64, aarch64]
name: Linux Release ${{ matrix.arch }}
runs-on: ubuntu-22-4core
steps:
Expand Down
73 changes: 36 additions & 37 deletions .github/workflows/test_php.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,43 +139,42 @@ jobs:
composer update --ignore-platform-reqs;
composer ${{ matrix.test }}'

# TODO: Re-enable once aarch64 is fixed.
# linux-aarch64:
# name: Linux aarch64
# runs-on: ubuntu-22-4core
# steps:
# - name: Checkout pending changes
# uses: protocolbuffers/protobuf-ci/checkout@v4
# with:
# ref: ${{ inputs.safe-checkout }}
#
# - name: Cross compile protoc for aarch64
# id: cross-compile
# uses: protocolbuffers/protobuf-ci/cross-compile-protoc@v4
# with:
# image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:6.4.0-cf84e92285ca133b9c8104ad7b14d70e953cbb8e
# credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
# architecture: linux-aarch64
#
# - name: Setup composer
# uses: protocolbuffers/protobuf-ci/composer-setup@v4
# with:
# cache-prefix: php-8.1
# directory: php
#
# - name: Run tests
# uses: protocolbuffers/protobuf-ci/docker@v4
# with:
# image: us-docker.pkg.dev/protobuf-build/containers/test/linux/php-aarch64@sha256:77ff9fdec867bbfb290ee0b10d8b7a3e5e434155daa5ec93de7341c7592b858d
# platform: linux/arm64
# credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
# extra-flags: -e COMPOSER_HOME=/workspace/composer-cache -e PROTOC=/workspace/${{ steps.cross-compile.outputs.protoc }}
# command: >-
# -c '
# cd php;
# composer update --ignore-platform-reqs;
# composer test;
# composer test_c'
linux-aarch64:
name: Linux aarch64
runs-on: ubuntu-22-4core
steps:
- name: Checkout pending changes
uses: protocolbuffers/protobuf-ci/checkout@v4
with:
ref: ${{ inputs.safe-checkout }}

- name: Cross compile protoc for aarch64
id: cross-compile
uses: protocolbuffers/protobuf-ci/cross-compile-protoc@v4
with:
image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:6.4.0-cf84e92285ca133b9c8104ad7b14d70e953cbb8e
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
architecture: linux-aarch64

- name: Setup composer
uses: protocolbuffers/protobuf-ci/composer-setup@v4
with:
cache-prefix: php-8.1
directory: php

- name: Run tests
uses: protocolbuffers/protobuf-ci/docker@v4
with:
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/php-aarch64@sha256:77ff9fdec867bbfb290ee0b10d8b7a3e5e434155daa5ec93de7341c7592b858d
platform: linux/arm64
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
extra-flags: -e COMPOSER_HOME=/workspace/composer-cache -e PROTOC=/workspace/${{ steps.cross-compile.outputs.protoc }}
command: >-
-cex '
cd php;
composer update --ignore-platform-reqs;
composer test;
composer test_c'

macos:
strategy:
Expand Down
61 changes: 30 additions & 31 deletions .github/workflows/test_ruby.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,37 +95,36 @@ jobs:
rake clobber_package gem;
PROTOC=/workspace/${{ steps.cross-compile.outputs.protoc }} rake test'

# TODO: Re-enable once aarch64 is fixed.
# linux-aarch64:
# name: Linux aarch64
# runs-on: ubuntu-22-4core
# steps:
# - name: Checkout pending changes
# uses: protocolbuffers/protobuf-ci/checkout@v4
# with:
# ref: ${{ inputs.safe-checkout }}
#
# - name: Cross compile protoc for aarch64
# id: cross-compile
# uses: protocolbuffers/protobuf-ci/cross-compile-protoc@v4
# with:
# image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:6.4.0-cf84e92285ca133b9c8104ad7b14d70e953cbb8e
# credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
# architecture: linux-aarch64
#
# - name: Run tests
# uses: protocolbuffers/protobuf-ci/docker@v4
# with:
# image: arm64v8/ruby:3.0.2-buster
# credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
# command: >-
# /bin/bash -cex '
# gem install bundler -v 2.5.13;
# cd /workspace/ruby;
# bundle;
# PROTOC=/workspace/${{ steps.cross-compile.outputs.protoc }} rake;
# rake clobber_package gem;
# PROTOC=/workspace/${{ steps.cross-compile.outputs.protoc }} rake test'
linux-aarch64:
name: Linux aarch64
runs-on: ubuntu-22-4core
steps:
- name: Checkout pending changes
uses: protocolbuffers/protobuf-ci/checkout@v4
with:
ref: ${{ inputs.safe-checkout }}

- name: Cross compile protoc for aarch64
id: cross-compile
uses: protocolbuffers/protobuf-ci/cross-compile-protoc@v4
with:
image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:6.4.0-cf84e92285ca133b9c8104ad7b14d70e953cbb8e
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
architecture: linux-aarch64

- name: Run tests
uses: protocolbuffers/protobuf-ci/docker@v4
with:
image: arm64v8/ruby:3.0.2-buster
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
command: >-
/bin/bash -cex '
gem install bundler -v 2.5.13;
cd /workspace/ruby;
bundle;
PROTOC=/workspace/${{ steps.cross-compile.outputs.protoc }} rake;
rake clobber_package gem;
PROTOC=/workspace/${{ steps.cross-compile.outputs.protoc }} rake test'

macos:
strategy:
Expand Down
Loading