Merge branch 'main' into terrysahaidak/upload-texture

Shopify · Sep 26, 2024 · 84a9fc8 · 84a9fc8
2 parents f84e80d + 32cd6cf
commit 84a9fc8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/.github/workflows/build-skia.yml b/.github/workflows/build-skia.yml
@@ -3,8 +3,6 @@ on: workflow_dispatch
 jobs:
   build:
     runs-on: macos-latest
-    env:
-      WORKING_DIRECTORY: ./package
     steps:
       - name: checkout
         uses: actions/checkout@v3
@@ -20,18 +18,13 @@ jobs:
       - name: Setup Ninja
         uses: seanmiddleditch/gha-setup-ninja@master
 
-      - name: Setup Nodejs and npm
-        uses: actions/setup-node@v3
+      - name: Setup
+        uses: ./.github/actions/setup
         with:
-          cache-dependency-path: package/yarn.lock
-          cache: yarn
-
-      - name: Install root node dependencies
-        working-directory: ${{ env.WORKING_DIRECTORY }}
-        run: yarn
+          github_token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build Skia
-        working-directory: ${{ env.WORKING_DIRECTORY }}
+        working-directory: ./packages/skia
         env:
           ANDROID_NDK: ${{ steps.setup-ndk.outputs.ndk-path }}
         run: yarn build-skia

diff --git a/packages/skia/package.json b/packages/skia/package.json
@@ -54,7 +54,7 @@
     "copy-skia-include-headers": "yarn rimraf ./cpp/skia/include/ && cp -a ../../externals/skia/include/. ./cpp/skia/include",
     "copy-skia-module-headers": "ts-node ./scripts/copy-skia-module-headers.ts",
     "copy-skia-headers": "yarn copy-skia-include-headers && yarn copy-skia-module-headers",
-    "build-skia": "yarn build-skia-ios && yarn build-skia-android && yarn copy-skia-headers",
+    "build-skia": "yarn rimraf ./libs && yarn build-skia-ios && yarn build-skia-android && yarn copy-skia-headers",
     "clang-format": "yarn clang-format-ios && yarn clang-format-android && yarn clang-format-common",
     "clang-format-ios": "find ios/ -iname '*.h' -o -iname '*.mm' -o -iname '*.cpp' | xargs clang-format -i",
     "clang-format-android": "find android/cpp/ -iname '*.h' -o -iname '*.m' -o -iname '*.cpp' | xargs clang-format -i",