Skip to content

Commit 03c50e3

Browse files
mkruskal-googlemkruskal-google
authored
Re-enable aarch64 tests. (#20853)
* Re-enable aarch64 tests. These were broken by a QEMU bug that appears to have been broken by a recent hardening added to the ubuntu kernel rolled out to the github runner images. See https://bugs.launchpad.net/ubuntu/+source/qemu/+bug/2096782 and tonistiigi/binfmt#215 for more information. PiperOrigin-RevId: 740819705 * Fix bazel image in php
1 parent 128f0aa commit 03c50e3

File tree

3 files changed

+67
-70
lines changed

3 files changed

+67
-70
lines changed

‎.github/workflows/test_cpp.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,7 @@ jobs:
100100
strategy:
101101
fail-fast: false # Don't cancel all jobs if one fails.
102102
matrix:
103-
# TODO: Re-enable once aarch64 is fixed.
104-
arch: [x86_64]
103+
arch: [x86_64, aarch64]
105104
name: Linux Release ${{ matrix.arch }}
106105
runs-on: ubuntu-22-4core
107106
steps:

‎.github/workflows/test_php.yml

Lines changed: 36 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -139,43 +139,42 @@ jobs:
139139
composer update --ignore-platform-reqs;
140140
composer ${{ matrix.test }}'
141141
142-
# TODO: Re-enable once aarch64 is fixed.
143-
# linux-aarch64:
144-
# name: Linux aarch64
145-
# runs-on: ubuntu-22-4core
146-
# steps:
147-
# - name: Checkout pending changes
148-
# uses: protocolbuffers/protobuf-ci/checkout@v4
149-
# with:
150-
# ref: ${{ inputs.safe-checkout }}
151-
#
152-
# - name: Cross compile protoc for aarch64
153-
# id: cross-compile
154-
# uses: protocolbuffers/protobuf-ci/cross-compile-protoc@v4
155-
# with:
156-
# image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:6.4.0-cf84e92285ca133b9c8104ad7b14d70e953cbb8e
157-
# credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
158-
# architecture: linux-aarch64
159-
#
160-
# - name: Setup composer
161-
# uses: protocolbuffers/protobuf-ci/composer-setup@v4
162-
# with:
163-
# cache-prefix: php-8.1
164-
# directory: php
165-
#
166-
# - name: Run tests
167-
# uses: protocolbuffers/protobuf-ci/docker@v4
168-
# with:
169-
# image: us-docker.pkg.dev/protobuf-build/containers/test/linux/php-aarch64@sha256:77ff9fdec867bbfb290ee0b10d8b7a3e5e434155daa5ec93de7341c7592b858d
170-
# platform: linux/arm64
171-
# credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
172-
# extra-flags: -e COMPOSER_HOME=/workspace/composer-cache -e PROTOC=/workspace/${{ steps.cross-compile.outputs.protoc }}
173-
# command: >-
174-
# -c '
175-
# cd php;
176-
# composer update --ignore-platform-reqs;
177-
# composer test;
178-
# composer test_c'
142+
linux-aarch64:
143+
name: Linux aarch64
144+
runs-on: ubuntu-22-4core
145+
steps:
146+
- name: Checkout pending changes
147+
uses: protocolbuffers/protobuf-ci/checkout@v4
148+
with:
149+
ref: ${{ inputs.safe-checkout }}
150+
151+
- name: Cross compile protoc for aarch64
152+
id: cross-compile
153+
uses: protocolbuffers/protobuf-ci/cross-compile-protoc@v4
154+
with:
155+
image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:6.4.0-cf84e92285ca133b9c8104ad7b14d70e953cbb8e
156+
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
157+
architecture: linux-aarch64
158+
159+
- name: Setup composer
160+
uses: protocolbuffers/protobuf-ci/composer-setup@v4
161+
with:
162+
cache-prefix: php-8.1
163+
directory: php
164+
165+
- name: Run tests
166+
uses: protocolbuffers/protobuf-ci/docker@v4
167+
with:
168+
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/php-aarch64@sha256:77ff9fdec867bbfb290ee0b10d8b7a3e5e434155daa5ec93de7341c7592b858d
169+
platform: linux/arm64
170+
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
171+
extra-flags: -e COMPOSER_HOME=/workspace/composer-cache -e PROTOC=/workspace/${{ steps.cross-compile.outputs.protoc }}
172+
command: >-
173+
-cex '
174+
cd php;
175+
composer update --ignore-platform-reqs;
176+
composer test;
177+
composer test_c'
179178
180179
macos:
181180
strategy:

‎.github/workflows/test_ruby.yml

Lines changed: 30 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -95,37 +95,36 @@ jobs:
9595
rake clobber_package gem;
9696
PROTOC=/workspace/${{ steps.cross-compile.outputs.protoc }} rake test'
9797
98-
# TODO: Re-enable once aarch64 is fixed.
99-
# linux-aarch64:
100-
# name: Linux aarch64
101-
# runs-on: ubuntu-22-4core
102-
# steps:
103-
# - name: Checkout pending changes
104-
# uses: protocolbuffers/protobuf-ci/checkout@v4
105-
# with:
106-
# ref: ${{ inputs.safe-checkout }}
107-
#
108-
# - name: Cross compile protoc for aarch64
109-
# id: cross-compile
110-
# uses: protocolbuffers/protobuf-ci/cross-compile-protoc@v4
111-
# with:
112-
# image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:6.4.0-cf84e92285ca133b9c8104ad7b14d70e953cbb8e
113-
# credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
114-
# architecture: linux-aarch64
115-
#
116-
# - name: Run tests
117-
# uses: protocolbuffers/protobuf-ci/docker@v4
118-
# with:
119-
# image: arm64v8/ruby:3.0.2-buster
120-
# credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
121-
# command: >-
122-
# /bin/bash -cex '
123-
# gem install bundler -v 2.5.13;
124-
# cd /workspace/ruby;
125-
# bundle;
126-
# PROTOC=/workspace/${{ steps.cross-compile.outputs.protoc }} rake;
127-
# rake clobber_package gem;
128-
# PROTOC=/workspace/${{ steps.cross-compile.outputs.protoc }} rake test'
98+
linux-aarch64:
99+
name: Linux aarch64
100+
runs-on: ubuntu-22-4core
101+
steps:
102+
- name: Checkout pending changes
103+
uses: protocolbuffers/protobuf-ci/checkout@v4
104+
with:
105+
ref: ${{ inputs.safe-checkout }}
106+
107+
- name: Cross compile protoc for aarch64
108+
id: cross-compile
109+
uses: protocolbuffers/protobuf-ci/cross-compile-protoc@v4
110+
with:
111+
image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:6.4.0-cf84e92285ca133b9c8104ad7b14d70e953cbb8e
112+
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
113+
architecture: linux-aarch64
114+
115+
- name: Run tests
116+
uses: protocolbuffers/protobuf-ci/docker@v4
117+
with:
118+
image: arm64v8/ruby:3.0.2-buster
119+
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
120+
command: >-
121+
/bin/bash -cex '
122+
gem install bundler -v 2.5.13;
123+
cd /workspace/ruby;
124+
bundle;
125+
PROTOC=/workspace/${{ steps.cross-compile.outputs.protoc }} rake;
126+
rake clobber_package gem;
127+
PROTOC=/workspace/${{ steps.cross-compile.outputs.protoc }} rake test'
129128
130129
macos:
131130
strategy:

0 commit comments

Comments
 (0)