@@ -16,7 +16,7 @@ permissions:
16
16
contents : write
17
17
18
18
env :
19
- version : m132-9b3c42e2f9-2
19
+ version : m132-9b3c42e2f9-3
20
20
21
21
jobs :
22
22
macos :
@@ -138,68 +138,29 @@ jobs:
138
138
GITHUB_TOKEN : ${{ secrets.GITHUB_TOKEN }}
139
139
140
140
linux-arm64 :
141
- runs-on : ubuntu-22.04
141
+ runs-on : ubuntu-22.04-arm
142
142
strategy :
143
143
matrix :
144
144
build_type : [ Debug, Release ]
145
145
fail-fast : false
146
146
steps :
147
147
- uses : actions/checkout@v2
148
- - uses : uraimo/ run-on-arch- action@v2.8.1
148
+ - uses : addnab/docker- run-action@v3
149
149
name : Assemble
150
150
id : assemble
151
- if : ${{ github.event.inputs.skip_release != 'true' && github.ref == 'refs/heads/main' }}
152
- with :
153
- arch : aarch64
154
- distro : ubuntu22.04
155
- githubToken : ${{ secrets.GITHUB_TOKEN }}
156
- # Mount checkout directory as /checkout in the container
157
- dockerRunArgs : |
158
- --volume "${GITHUB_WORKSPACE}:/checkout"
159
- env : |
160
- build_type: ${{ matrix.build_type }}
161
- build_version: ${{ env.version }}
162
- artifact_name: Skia-${{ env.version }}-linux-${{ matrix.build_type }}-arm64.zip
163
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
164
- # The shell to run commands with in the container
165
- shell : /bin/bash
166
- install : |
167
- apt-get update -q -y
168
- apt-get install -q -y bash
169
- run : |
170
- cd /checkout
171
- /bin/bash script/prepare_linux_arm.sh
172
- python3 script/check_release.py --version ${build_version} --build-type ${build_type}
173
- python3 script/checkout.py --version ${build_version}
174
- python3 script/build.py --build-type ${build_type} --build-type ${build_type}
175
- python3 script/archive.py --version ${build_version} --build-type ${build_type}
176
- echo "Produced artifact at ${PWD}/${artifact_name}"
177
-
178
- name : Test Build
179
- id : test-build
180
- if : ${{ github.event.inputs.skip_release == 'true' || github.ref != 'refs/heads/main' }}
181
151
with :
182
- arch : aarch64
183
- distro : ubuntu22.04
184
- githubToken : ${{ secrets.GITHUB_TOKEN }}
152
+ image : arm64v8/ubuntu:20.04
185
153
# Mount checkout directory as /checkout in the container
186
- dockerRunArgs : |
187
- --volume "${GITHUB_WORKSPACE}:/checkout"
188
- env : |
189
- build_type: ${{ matrix.build_type }}
190
- build_version: ${{ env.version }}
191
- artifact_name: Skia-${{ env.version }}-linux-${{ matrix.build_type }}-arm64.zip
154
+ options : -v ${{ github.workspace }}:/checkout -e BUILD_TYPE=${{ matrix.build_type }} -e BUILD_VERSION=${{ env.version }}
192
155
# The shell to run commands with in the container
193
156
shell : /bin/bash
194
- install : |
195
- apt-get update -q -y
196
- apt-get install -q -y bash
197
157
run : |
198
158
cd /checkout
199
159
/bin/bash script/prepare_linux_arm.sh
200
- python3 script/checkout.py --version ${build_version}
201
- python3 script/build.py --build-type ${build_type} --build-type ${build_type}
202
- echo "Verified build"
160
+ python3 script/check_release.py --version ${BUILD_VERSION} --build-type ${BUILD_TYPE}
161
+ python3 script/checkout.py --version ${BUILD_VERSION}
162
+ python3 script/build.py --build-type ${BUILD_TYPE}
163
+ python3 script/archive.py --version ${BUILD_VERSION} --build-type ${BUILD_TYPE}
203
164
- uses : actions/upload-artifact@v4
204
165
if : ${{ github.event.inputs.skip_release != 'true' && github.ref == 'refs/heads/main' }}
205
166
with :
0 commit comments