Skip to content

Commit 2f53e9e

Browse files
committed
fix musl
1 parent 9a6bb31 commit 2f53e9e

File tree

1 file changed

+16
-3
lines changed

1 file changed

+16
-3
lines changed

.github/workflows/skia.yaml

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -179,10 +179,11 @@ jobs:
179179
uses: addnab/docker-run-action@v3
180180
with:
181181
image: ghcr.io/brooooooklyn/canvas/musl-builder:lts
182-
options: '-v ${{ github.workspace }}:/canvas -w /canvas -e GN_EXE=gn -e PYTHONHTTPSVERIFY=0'
182+
options: '-v ${{ github.workspace }}:/canvas -w /canvas -e PYTHONHTTPSVERIFY=0'
183183
run: |
184184
apk add gn libc++-dev libc++-static
185185
rm /usr/lib/libc++.so /usr/lib/libc++.so.1 /usr/lib/libc++.so.1.0 /usr/lib/libc++abi.so /usr/lib/libc++abi.so.1 /usr/lib/libc++abi.so.1.0
186+
ln -sf $(which gn) /canvas/skia/bin/gn
186187
node ./scripts/build-skia.js
187188
188189
- name: Install dependencies
@@ -268,11 +269,12 @@ jobs:
268269
uses: addnab/docker-run-action@v3
269270
with:
270271
image: ghcr.io/brooooooklyn/canvas/musl-builder:lts
271-
options: '-v ${{ github.workspace }}:/canvas -w /canvas -e GN_EXE=gn -e PYTHONHTTPSVERIFY=0'
272+
options: '-v ${{ github.workspace }}:/canvas -w /canvas -e PYTHONHTTPSVERIFY=0'
272273
run: |
273274
cp -r /canvas/aarch64-linux-musl-cross/llvm/include/c++ /aarch64-linux-musl-cross/include
274275
cp /canvas/aarch64-linux-musl-cross/llvm/lib/* /aarch64-linux-musl-cross/lib
275276
apk add gn
277+
ln -sf $(which gn) /canvas/skia/bin/gn
276278
node ./scripts/build-skia.js --target=aarch64-unknown-linux-musl
277279
278280
- name: Install dependencies
@@ -306,10 +308,21 @@ jobs:
306308
with:
307309
node-version: 22
308310

311+
- name: Sync deps
312+
uses: nick-fields/retry@v3
313+
with:
314+
timeout_minutes: 10
315+
max_attempts: 5
316+
command: |
317+
cd skia
318+
python ./tools/git-sync-deps
319+
env:
320+
PYTHONHTTPSVERIFY: 0
321+
309322
- name: Compile skia
310323
run: node ./scripts/build-skia.js --target=armv7-unknown-linux-gnueabihf
311324
env:
312-
PYTHONHTTPSVERIFY: 0
325+
SKIP_SYNC_SK_DEPS: 0
313326

314327
- name: Install dependencies
315328
run: |

0 commit comments

Comments
 (0)