From b6a88c7126b27dbdec74e2cab804afe79d68c4ac Mon Sep 17 00:00:00 2001
From: csmartdalton <hello@rive.app>
Date: Fri, 8 Sep 2023 22:39:09 +0000
Subject: [PATCH] Checkout and build the Rive Renderer into iOS deployments

Diffs=
dce695271 Checkout and build the Rive Renderer into iOS deployments (#5962)

Co-authored-by: Chris Dalton <99840794+csmartdalton@users.noreply.github.com>
---
 .github/workflows/release.yml | 14 ++++++++++++++
 .github/workflows/tests.yml   | 25 ++++++++++++++++++++++++-
 .rive_head                    |  2 +-
 .rive_renderer                |  1 +
 4 files changed, 40 insertions(+), 2 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..33afe302 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -1,9 +1,10 @@
 name: Run Rive tests
 
 on:
-  push:
+  pull_request:
     branches:
       - main
+  push:
 
 jobs:
   build-skia:
@@ -58,6 +59,7 @@ jobs:
         with:
           token: ${{ secrets.PAT_GITHUB }}
           submodules: true
+
       - name: Installing pre-requisites
         run: |
           set -x
@@ -70,7 +72,28 @@ 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: 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: 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_head b/.rive_head
index 6492dda0..dfcf6356 100644
--- a/.rive_head
+++ b/.rive_head
@@ -1 +1 @@
-ea5593879655ce9be71e18b9b9dd486f29195c92
+dce69527198a927073731415d23131e8e9d394d2
diff --git a/.rive_renderer b/.rive_renderer
new file mode 100644
index 00000000..01b4e523
--- /dev/null
+++ b/.rive_renderer
@@ -0,0 +1 @@
+1b5319960e3fe85e06535ce447c50665ed1ee764