Merge branch 'main' into wcandillon-patch-32

Shopify · Sep 27, 2024 · cb011db · cb011db
2 parents 5ad7ad8 + a7970cf
commit cb011db
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 18 deletions.
diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
@@ -4,7 +4,11 @@ description: Setup Node.js and install dependencies
 inputs:
   github_token:
     description: 'GitHub Token'
-    required: true
+    required: false
+  download_skia:
+    description: 'Download Skia Binary Artifacts'
+    required: false
+    default: 'true'
 
 runs:
   using: composite
@@ -32,6 +36,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 +45,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
+      shell: bash
diff --git a/.github/workflows/build-skia.yml b/.github/workflows/build-skia.yml
@@ -18,27 +18,17 @@ 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
         env:
           ANDROID_NDK: ${{ steps.setup-ndk.outputs.ndk-path }}
+          GIT_SYNC_DEPS_SKIP_EMSDK: 'true'
         run: yarn build-skia
 
       - name: Upload artifacts - Android arm
@@ -107,4 +97,4 @@ jobs:
         with:
           name: skia-ios-xcframeworks
           path: |
-            ./packages/skia/libs/ios/*.xcframework
+            ./packages/skia/libs/ios/*.xcframework