💚

Shopify · Sep 2, 2024 · e9dc5c7 · e9dc5c7
1 parent 2560d6c
commit e9dc5c7
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 71 deletions.
diff --git a/.github/workflows/android-ubuntu.yml b/.github/workflows/android-ubuntu.yml
@@ -12,20 +12,19 @@ jobs:
     timeout-minutes: 55
     strategy:
       matrix:
-        directory: [example]
+        directory: [apps/paper]
     concurrency:
       group: android-ubuntu-${{ matrix.directory }}-${{ github.ref }}
       cancel-in-progress: true
     steps:
       - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           submodules: recursive
-
-      - uses: actions/setup-node@v3
+      - name: Setup
+        uses: ./.github/actions/setup
         with:
-          cache: 'yarn'
-          cache-dependency-path: package/yarn.lock
+          github_token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Set up JDK 11
         uses: actions/setup-java@v1
@@ -41,34 +40,9 @@ jobs:
       - name: Set ANDROID_NDK
         run: echo "ANDROID_NDK=$ANDROID_HOME/ndk-bundle" >> $GITHUB_ENV
 
-      - name: Install Package
-        working-directory: package
-        run: yarn
-
-      - name: Download Skia Binary Artifacts
-        uses: dawidd6/action-download-artifact@v2
-        with:
-          workflow: "build-skia.yml"
-          repo: shopify/react-native-skia
-          path: package/artifacts
-          branch: main
-
-      - name: Copy Artifacts to libs folder
-        working-directory: package
-        run: yarn workflow-copy-libs
-
-      - name: Copy Skia Headers
-        working-directory: package
-        run: yarn copy-skia-headers
-
       - name: SDKs - accept licenses
         run: yes | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --licenses
 
-      # Install node dependencies in specified directories using matrix
-      - name: Install app node dependencies
-        working-directory: ${{ matrix.directory }}
-        run: yarn
-
       # Cache hermes build for both directories
       - name: Cache hermes build
         uses: actions/cache@v3

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -18,15 +18,14 @@ jobs:
       cancel-in-progress: true
     steps:
       - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           submodules: recursive
 
-      - uses: actions/setup-node@v3
+      - name: Setup
+        uses: ./.github/actions/setup
         with:
-          node-version: 16
-          cache-dependency-path: package/yarn.lock
-          cache: 'yarn'
+          github_token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Set up JDK 11
         uses: actions/setup-java@v1
@@ -41,34 +40,10 @@ jobs:
 
       - name: Set ANDROID_NDK
         run: echo "ANDROID_NDK=$ANDROID_HOME/ndk-bundle" >> $GITHUB_ENV
-
-      - name: Install Package
-        working-directory: package
-        run: yarn install
-
-      - name: Download Skia Binary Artifacts
-        uses: dawidd6/action-download-artifact@v2
-        with:
-          workflow: "build-skia.yml"
-          repo: shopify/react-native-skia
-          path: package/artifacts
-          branch: main
-
-      - name: Copy Artifacts to libs folder
-        working-directory: package
-        run: yarn workflow-copy-libs
-
-      - name: Copy Skia Headers
-        working-directory: package
-        run: yarn copy-skia-headers
 
       - name: SDKs - accept licenses
         run: y | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --licenses
 
-      - name: Install example app node dependencies
-        working-directory: ${{ matrix.working-directory }}
-        run: yarn
-
       - name: Cache hermes build
         uses: actions/cache@v3
         env:

diff --git a/packages/skia/scripts/copy-skia-module-headers.ts b/packages/skia/scripts/copy-skia-module-headers.ts
@@ -2,33 +2,33 @@ import { executeCmdSync } from "./utils";
 
 const copyModule = (module: string) => [
   `mkdir -p ./cpp/skia/modules/${module}/include`,
-  `cp -a ../externals/skia/modules/${module}/include/. ./cpp/skia/modules/${module}/include`,
+  `cp -a ../../externals/skia/modules/${module}/include/. ./cpp/skia/modules/${module}/include`,
 ];
 
 [
   "yarn rimraf ./cpp/skia/modules/",
   ...copyModule("svg"),
   ...copyModule("skresources"),
   ...copyModule("skparagraph"),
-  "cp -a ../externals/skia/modules/skcms/. ./cpp/skia/modules/skcms",
+  "cp -a ../../externals/skia/modules/skcms/. ./cpp/skia/modules/skcms",
   "mkdir -p ./cpp/skia/src/",
   "mkdir -p ./cpp/skia/src/core/",
-  "cp -a ../externals/skia/src/core/SkPathEnums.h ./cpp/skia/src/core/.",
-  "cp -a ../externals/skia/src/core/SkPathPriv.h ./cpp/skia/src/core/.",
-  "cp -a ../externals/skia/src/core/SkChecksum.h ./cpp/skia/src/core/.",
-  "cp -a ../externals/skia/src/core/SkTHash.h ./cpp/skia/src/core/.",
+  "cp -a ../../externals/skia/src/core/SkPathEnums.h ./cpp/skia/src/core/.",
+  "cp -a ../../externals/skia/src/core/SkPathPriv.h ./cpp/skia/src/core/.",
+  "cp -a ../../externals/skia/src/core/SkChecksum.h ./cpp/skia/src/core/.",
+  "cp -a ../../externals/skia/src/core/SkTHash.h ./cpp/skia/src/core/.",
 
   "mkdir -p ./cpp/skia/src/gpu/ganesh/gl",
-  "cp -a ../externals/skia/src/gpu/ganesh/gl/GrGLDefines.h ./cpp/skia/src/gpu/ganesh/gl/.",
+  "cp -a ../../externals/skia/src/gpu/ganesh/gl/GrGLDefines.h ./cpp/skia/src/gpu/ganesh/gl/.",
 
-  "cp -a ../externals/skia/src/core/SkLRUCache.h ./cpp/skia/src/core/.",
+  "cp -a ../../externals/skia/src/core/SkLRUCache.h ./cpp/skia/src/core/.",
 
   "mkdir -p ./cpp/skia/src/base",
-  "cp -a ../externals/skia/src/base/SkTInternalLList.h ./cpp/skia/src/base/.",
-  "cp -a ../externals/skia/src/base/SkUTF.h ./cpp/skia/src/base/.",
+  "cp -a ../../externals/skia/src/base/SkTInternalLList.h ./cpp/skia/src/base/.",
+  "cp -a ../../externals/skia/src/base/SkUTF.h ./cpp/skia/src/base/.",
 
   "mkdir -p ./cpp/skia/modules/skunicode/include/",
-  "cp -a ../externals/skia/modules/skunicode/include/SkUnicode.h ./cpp/skia/modules/skunicode/include/.",
+  "cp -a ../../externals/skia/modules/skunicode/include/SkUnicode.h ./cpp/skia/modules/skunicode/include/.",
 
   // eslint-disable-next-line max-len
   "rm ./cpp/skia/include/gpu/GrBackendDrawableInfo.h", // Remove since there are now (Skia M123) two headers with the same name