From 2516b6c7f43c0f8b52ca8394b57eca640d69fcb5 Mon Sep 17 00:00:00 2001
From: Chris Dalton <chris@rive.app>
Date: Fri, 8 Sep 2023 10:47:18 -0600
Subject: [PATCH] rive-ios additions

---
 .github/workflows/release.yml | 14 ++++++++
 .github/workflows/tests.yml   | 66 ++++++++++++-----------------------
 .rive_renderer                |  1 +
 3 files changed, 38 insertions(+), 43 deletions(-)
 create mode 100644 .rive_renderer

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b3805d6d..704273db 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -103,6 +103,20 @@ jobs:
         with:
           submodules: true
           token: ${{ secrets.PAT_GITHUB }}
+
+      - name: Get Renderer ref
+        id: renderer-ref
+        run: echo "REF_VALUE=$(cat .rive_renderer)" >> $GITHUB_OUTPUT
+
+      - name: Checkout Rive Renderer Repo
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+          repository: ${{ secrets.RIVE_RENDERER_REPO }}
+          token: ${{ secrets.PAT_GITHUB }}
+          path: ./submodules/pls
+          ref: ${{ steps.renderer-ref.outputs.REF_VALUE }}
+
       - name: Installing pre-requisites
         run: |
           set -x
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index f29111a0..ce16c7b5 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -1,63 +1,35 @@
 name: Run Rive tests
 
 on:
-  push:
+  pull_request:
     branches:
       - main
+  push:
 
 jobs:
-  build-skia:
-    strategy:
-      matrix:
-        arch: ["x86", "x64", "arm", "arm64", "iossim_arm64"]
-
+  run_tests:
+    name: Run Rive tests
     runs-on: [self-hosted, macOS, ARM64]
-    permissions:
-      id-token: write
-      contents: read
     steps:
-      - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v1
-        with:
-          aws-region: us-west-2
-          role-to-assume: ${{ secrets.ACTIONS_ROLE }}
-      - name: Checkout Code
+      - name: Checkout
         uses: actions/checkout@v3
         with:
-          submodules: true
           token: ${{ secrets.PAT_GITHUB }}
+          submodules: true
 
-      - name: Update Java
-        uses: actions/setup-java@v2
-        with:
-          distribution: "zulu"
-          java-version: "16"
+      - name: Get Renderer ref
+        id: renderer-ref
+        run: echo "REF_VALUE=$(cat .rive_renderer)" >> $GITHUB_OUTPUT
 
-      - name: Installing pre-requisites
-        run: |
-          set -x
-          # Install some dependencies & premake5
-          brew install ninja
-          curl https://github.com/premake/premake-core/releases/download/v5.0.0-beta1/premake-5.0.0-beta1-macosx.tar.gz -L -o premake_macosx.tar.gz
-          tar -xvf premake_macosx.tar.gz 2>/dev/null
-          rm premake_macosx.tar.gz
-          mkdir bin
-          cp premake5 bin/premake5
-          sudo chmod a+x premake5
-          sudo mv premake5 /usr/local/bin
-      - name: Build skia files
-        run: ./scripts/build.skia.sh -a ${{ matrix.arch }}
-
-  run_tests:
-    name: Run Rive tests
-    needs: build-skia
-    runs-on: [self-hosted, macOS, ARM64]
-    steps:
-      - name: Checkout
+      - name: Checkout Rive Renderer Repo
         uses: actions/checkout@v3
         with:
-          token: ${{ secrets.PAT_GITHUB }}
           submodules: true
+          repository: ${{ secrets.RIVE_RENDERER_REPO }}
+          token: ${{ secrets.PAT_GITHUB }}
+          path: ./submodules/pls
+          ref: ${{ steps.renderer-ref.outputs.REF_VALUE }}
+
       - name: Installing pre-requisites
         run: |
           set -x
@@ -70,7 +42,15 @@ jobs:
           mkdir bin
           cp premake5 bin/premake5
           sudo mv premake5 /usr/local/bin
+
+      - name: Build everything WITHOUT Rive Renderer
+        run: ./scripts/build.sh ios_sim debug
+
+      - name: Testing iOS app WITHOUT Rive Renderer
+        run: ./scripts/test.sh
+
       - name: Build everything (using the cache, we should make an archive of course)
         run: ./scripts/build.sh ios_sim debug
+
       - name: Testing iOS app
         run: ./scripts/test.sh
diff --git a/.rive_renderer b/.rive_renderer
new file mode 100644
index 00000000..01b4e523
--- /dev/null
+++ b/.rive_renderer
@@ -0,0 +1 @@
+1b5319960e3fe85e06535ce447c50665ed1ee764