Skip to content

Commit 6aefdde

Browse files
Adam Cozzettecopybara-github
authored andcommitted
Automated rollback of commit 46e602c.
PiperOrigin-RevId: 737031015
1 parent 46e602c commit 6aefdde

File tree

3 files changed

+70
-67
lines changed

3 files changed

+70
-67
lines changed

.github/workflows/test_cpp.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,8 @@ jobs:
105105
strategy:
106106
fail-fast: false # Don't cancel all jobs if one fails.
107107
matrix:
108-
arch: [x86_64, aarch64]
108+
# TODO: Re-enable once aarch64 is fixed.
109+
arch: [x86_64]
109110
name: Linux Release ${{ matrix.arch }}
110111
runs-on: ubuntu-22-4core
111112
steps:

.github/workflows/test_php.yml

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

187188
macos:
188189
strategy:

.github/workflows/test_ruby.yml

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

130131
macos:
131132
strategy:

0 commit comments

Comments
 (0)