Skip to content

Commit 71cc4c8

Browse files
committed
build all arm target in Ubuntu 22.04 with git updated
1 parent b358d3d commit 71cc4c8

File tree

2 files changed

+4
-11
lines changed

2 files changed

+4
-11
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ jobs:
152152
if: ${{ github.event.inputs.skip_release != 'true' && github.ref == 'refs/heads/main' }}
153153
with:
154154
arch: aarch64
155-
distro: ubuntu20.04
155+
distro: ubuntu22.04
156156
githubToken: ${{ secrets.GITHUB_TOKEN }}
157157
# Mount checkout directory as /checkout in the container
158158
dockerRunArgs: |
@@ -164,10 +164,6 @@ jobs:
164164
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
165165
# The shell to run commands with in the container
166166
shell: /bin/bash
167-
install: |
168-
apt-get clean
169-
apt-get update -q -y
170-
apt-get install -q -y bash
171167
run: |
172168
cd /checkout
173169
/bin/bash script/prepare_linux_arm.sh
@@ -182,7 +178,7 @@ jobs:
182178
if: ${{ github.event.inputs.skip_release == 'true' || github.ref != 'refs/heads/main' }}
183179
with:
184180
arch: aarch64
185-
distro: ubuntu20.04
181+
distro: ubuntu22.04
186182
githubToken: ${{ secrets.GITHUB_TOKEN }}
187183
# Mount checkout directory as /checkout in the container
188184
dockerRunArgs: |
@@ -193,10 +189,6 @@ jobs:
193189
artifact_name: Skia-${{ env.version }}-linux-${{ matrix.build_type }}-arm64.zip
194190
# The shell to run commands with in the container
195191
shell: /bin/bash
196-
install: |
197-
apt-get clean
198-
apt-get update -q -y
199-
apt-get install -q -y bash
200192
run: |
201193
cd /checkout
202194
/bin/bash script/prepare_linux_arm.sh

script/prepare_linux_arm.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@ export DEBIAN_FRONTEND=noninteractive
66
apt-get update -y
77
apt-get install binutils build-essential -y
88
apt-get install software-properties-common -y
9-
apt-get install python3 git fontconfig libfontconfig1-dev libglu1-mesa-dev curl wget -y
9+
add-apt-repository ppa:git-core/ppa -y
10+
apt-get install python3 git fontconfig libfontconfig1-dev libgl-dev curl wget -y
1011
apt-get install clang -y

0 commit comments

Comments
 (0)