Merge branch 'main' into wcandillon-patch-6

Author: wcandillon

.github/workflows/android-ubuntu.yml

@@ -0,0 +1,87 @@
+name: Android Ubuntu
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    timeout-minutes: 55
+    steps:
+      - name: checkout
+        uses: actions/checkout@v3
+        with:
+          submodules: recursive
+
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 16
+          cache: 'yarn'
+
+      - name: Set up JDK 11
+        uses: actions/setup-java@v1
+        with:
+          java-version: '11'
+
+      - name: Install NDK
+        uses: nttld/setup-ndk@v1
+        id: setup-ndk
+        with:
+          ndk-version: r21d
+
+      - name: Set ANDROID_NDK
+        run: echo "ANDROID_NDK=$ANDROID_HOME/ndk-bundle" >> $GITHUB_ENV
+
+      - name: Install root node dependencies
+        run: yarn
+
+      - name: Download Skia Binary Artifacts
+        uses: dawidd6/action-download-artifact@v2
+        with:
+          workflow: "build-skia.yml"
+          repo: shopify/react-native-skia
+          path: artifacts
+
+      - name: Copy Artifacts to libs folder
+        run: yarn workflow-copy-libs
+
+      - name: Copy Skia Headers
+        run: yarn copy-skia-headers
+
+      - name: SDKs - accept licenses
+        run: yes | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --licenses
+
+      - name: Install Package
+        working-directory: package
+        run: yarn install
+
+      - name: Install example app node dependencies
+        working-directory: example
+        run: yarn
+
+      - name: Cache hermes build
+        uses: actions/cache@v3
+        env:
+          cache-name: cache-rn-hermes-engine
+        with:
+          path: example/node_modules/react-native
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-example-${{ hashFiles('**/react-native/package.json') }}
+
+      - name: Cache android libraries
+        uses: actions/cache@v3
+        env:
+          cache-name: cache-rn
+        with:
+          path: example/android/app/build
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-example-${{ hashFiles('**/react-native/package.json') }}
+
+      - name: Build Android app
+        working-directory: example/android
+        run: ./gradlew assembleDebug
+
+      - name: Cache apk
+        uses: actions/cache/save@v3
+        env:
+          cache-name: cache-apk
+        with:
+          path: example/android/app/build/outputs/apk/debug/app-debug.apk
+          key: apk-${{ github.sha }}

.github/workflows/android.yml

@@ -158,9 +158,16 @@ jobs:
           PACKAGE_NAME: ${{ matrix.working-directory == 'fabricexample' && 'com.fabricexample' || 'com.rnskia' }}  
         run: adb shell monkey -p ${{ env.PACKAGE_NAME }} 1  
 
+      # On fabric, the system fonts are slightly different
+      # so wont run the paragraph tests there for now
       - name: Run e2e Tests
         working-directory: package
-        run: CI=true yarn e2e
+        run: |
+          if [ "${{ matrix.working-directory }}" = "example" ]; then
+            CI=true yarn e2e
+          elif [ "${{ matrix.working-directory }}" = "fabricexample" ]; then
+            CI=true yarn e2e --testPathIgnorePatterns Paragraphs
+          fi
 
       - uses: actions/upload-artifact@v2
         if: failure()

docs/docs/shaders/language.md

@@ -8,6 +8,7 @@ slug: /shaders/overview
 Skia provides a shading language.
 You can play with it [here](https://shaders.skia.org/).
 The syntax is very similar to GLSL.
+If you're already familiar with GLSL, or are looking to convert a GLSL shader to SKSL, you can view a list of their differences [here](https://github.com/google/skia/tree/main/src/sksl#readme).
 
 The first step is to create a shader and compile it using `RuntimeEffect.Make`.