diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index 1d0c9e09e6..a58beb370d 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -2,9 +2,10 @@ name: Setup description: Setup Node.js and install dependencies inputs: - github_token: - description: 'GitHub Token' - required: true + download_skia: + description: 'Download Skia Binary Artifacts' + required: false + default: 'true' runs: using: composite @@ -32,6 +33,7 @@ runs: shell: bash - name: Download Skia Binary Artifacts + if: ${{ inputs.download_skia == 'true' }} uses: dawidd6/action-download-artifact@v2 with: workflow: "build-skia.yml" @@ -40,11 +42,13 @@ runs: branch: main - name: Copy Artifacts to libs folder + if: ${{ inputs.download_skia == 'true' }} working-directory: packages/skia run: yarn workflow-copy-libs shell: bash - name: Copy Skia Headers + if: ${{ inputs.download_skia == 'true' }} working-directory: packages/skia run: yarn copy-skia-headers - shell: bash \ No newline at end of file + shell: bash diff --git a/.github/workflows/build-skia.yml b/.github/workflows/build-skia.yml index 4e56e4b48a..9be22b3ffa 100644 --- a/.github/workflows/build-skia.yml +++ b/.github/workflows/build-skia.yml @@ -2,7 +2,7 @@ name: Build SKIA on: workflow_dispatch jobs: build: - runs-on: macos-latest + runs-on: macos-latest-large steps: - name: checkout uses: actions/checkout@v3 @@ -18,22 +18,11 @@ jobs: - name: Setup Ninja uses: seanmiddleditch/gha-setup-ninja@master - - name: Cache dependencies - id: yarn-cache - uses: actions/cache@v3 + - name: Setup + uses: ./.github/actions/setup with: - path: | - **/node_modules - .yarn/install-state.gz - key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}-${{ hashFiles('**/package.json', '!node_modules/**') }} - restore-keys: | - ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }} - ${{ runner.os }}-yarn- - - - name: Install dependencies - if: steps.yarn-cache.outputs.cache-hit != 'true' - run: yarn install --immutable - shell: bash + download_skia: 'false' + github_token: ${{ secrets.GITHUB_TOKEN }} - name: Build Skia working-directory: ./packages/skia @@ -107,4 +96,4 @@ jobs: with: name: skia-ios-xcframeworks path: | - ./packages/skia/libs/ios/*.xcframework + ./packages/skia/libs/ios/*.xcframework \ No newline at end of file