Skip to content

Commit a7970cf

Browse files
authored
💚 fix build-skia step (#2654)
1 parent 18147ad commit a7970cf

File tree

2 files changed

+15
-18
lines changed

2 files changed

+15
-18
lines changed

‎.github/actions/setup/action.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@ description: Setup Node.js and install dependencies
44
inputs:
55
github_token:
66
description: 'GitHub Token'
7-
required: true
7+
required: false
8+
download_skia:
9+
description: 'Download Skia Binary Artifacts'
10+
required: false
11+
default: 'true'
812

913
runs:
1014
using: composite
@@ -32,6 +36,7 @@ runs:
3236
shell: bash
3337

3438
- name: Download Skia Binary Artifacts
39+
if: ${{ inputs.download_skia == 'true' }}
3540
uses: dawidd6/action-download-artifact@v2
3641
with:
3742
workflow: "build-skia.yml"
@@ -40,11 +45,13 @@ runs:
4045
branch: main
4146

4247
- name: Copy Artifacts to libs folder
48+
if: ${{ inputs.download_skia == 'true' }}
4349
working-directory: packages/skia
4450
run: yarn workflow-copy-libs
4551
shell: bash
4652

4753
- name: Copy Skia Headers
54+
if: ${{ inputs.download_skia == 'true' }}
4855
working-directory: packages/skia
4956
run: yarn copy-skia-headers
50-
shell: bash
57+
shell: bash

‎.github/workflows/build-skia.yml

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,27 +18,17 @@ jobs:
1818
- name: Setup Ninja
1919
uses: seanmiddleditch/gha-setup-ninja@master
2020

21-
- name: Cache dependencies
22-
id: yarn-cache
23-
uses: actions/cache@v3
21+
- name: Setup
22+
uses: ./.github/actions/setup
2423
with:
25-
path: |
26-
**/node_modules
27-
.yarn/install-state.gz
28-
key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}-${{ hashFiles('**/package.json', '!node_modules/**') }}
29-
restore-keys: |
30-
${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
31-
${{ runner.os }}-yarn-
32-
33-
- name: Install dependencies
34-
if: steps.yarn-cache.outputs.cache-hit != 'true'
35-
run: yarn install --immutable
36-
shell: bash
24+
download_skia: 'false'
25+
github_token: ${{ secrets.GITHUB_TOKEN }}
3726

3827
- name: Build Skia
3928
working-directory: ./packages/skia
4029
env:
4130
ANDROID_NDK: ${{ steps.setup-ndk.outputs.ndk-path }}
31+
GIT_SYNC_DEPS_SKIP_EMSDK: 'true'
4232
run: yarn build-skia
4333

4434
- name: Upload artifacts - Android arm
@@ -107,4 +97,4 @@ jobs:
10797
with:
10898
name: skia-ios-xcframeworks
10999
path: |
110-
./packages/skia/libs/ios/*.xcframework
100+
./packages/skia/libs/ios/*.xcframework

0 commit comments

Comments
 (0)