From af1d6cb10a6a90f6ed24f54d06897b23a3513a51 Mon Sep 17 00:00:00 2001 From: rivessamr Date: Thu, 29 Aug 2024 22:00:33 -0700 Subject: [PATCH 1/5] Switch rive-cpp to rive-runtime repo --- .gitmodules | 7 ++++--- submodules/{rive-cpp => rive-runtime} | 0 2 files changed, 4 insertions(+), 3 deletions(-) rename submodules/{rive-cpp => rive-runtime} (100%) diff --git a/.gitmodules b/.gitmodules index 82b295a1..8311e72f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,4 @@ -[submodule "submodules/rive-cpp"] - path = submodules/rive-cpp - url = git@github.com:rive-app/rive-cpp.git +[submodule "submodules/rive-runtime"] + branch=main + path = submodules/rive-runtime + url = git@github.com:rive-app/rive-runtime.git diff --git a/submodules/rive-cpp b/submodules/rive-runtime similarity index 100% rename from submodules/rive-cpp rename to submodules/rive-runtime From 3426133f56160e692b4b4ed322598e92c6f3ee9a Mon Sep 17 00:00:00 2001 From: rivessamr Date: Thu, 29 Aug 2024 22:05:37 -0700 Subject: [PATCH 2/5] Fixed script in cpp --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 0228dbeb..015269a4 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -69,7 +69,7 @@ jobs: ls - name: Build rive for ${{ matrix.arch }} run: | - cd cpp && ./build.rive.for.sh -c -a ${{ matrix.arch }} + cd runtime && ./build.rive.for.sh -c -a ${{ matrix.arch }} env: NDK_PATH: ${{github.workspace}}/android-ndk-r25b # NOTE: this is sneaky, we are adding multiple files from the matrix jobs into the same artifact From 7b1a69fbe1d62e62f88fca2c842678731dde68a1 Mon Sep 17 00:00:00 2001 From: rivessamr Date: Thu, 29 Aug 2024 22:17:07 -0700 Subject: [PATCH 3/5] Fixed script in cpp --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 015269a4..0228dbeb 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -69,7 +69,7 @@ jobs: ls - name: Build rive for ${{ matrix.arch }} run: | - cd runtime && ./build.rive.for.sh -c -a ${{ matrix.arch }} + cd cpp && ./build.rive.for.sh -c -a ${{ matrix.arch }} env: NDK_PATH: ${{github.workspace}}/android-ndk-r25b # NOTE: this is sneaky, we are adding multiple files from the matrix jobs into the same artifact From 7fc8a459b1009d09e0cdc6e44b2bac12afbba8c1 Mon Sep 17 00:00:00 2001 From: rivessamr Date: Thu, 29 Aug 2024 22:23:17 -0700 Subject: [PATCH 4/5] Fixed directory in yaml file --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 0228dbeb..95812fe3 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -69,7 +69,7 @@ jobs: ls - name: Build rive for ${{ matrix.arch }} run: | - cd cpp && ./build.rive.for.sh -c -a ${{ matrix.arch }} + cd kotlin/src/main/cpp && ./build.rive.for.sh -c -a ${{ matrix.arch }} env: NDK_PATH: ${{github.workspace}}/android-ndk-r25b # NOTE: this is sneaky, we are adding multiple files from the matrix jobs into the same artifact From 4d8d70d9beed8dbe0367777e53561d6f389e4a94 Mon Sep 17 00:00:00 2001 From: rivessamr Date: Thu, 29 Aug 2024 22:41:51 -0700 Subject: [PATCH 5/5] Revert back to cpp directory --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 95812fe3..0228dbeb 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -69,7 +69,7 @@ jobs: ls - name: Build rive for ${{ matrix.arch }} run: | - cd kotlin/src/main/cpp && ./build.rive.for.sh -c -a ${{ matrix.arch }} + cd cpp && ./build.rive.for.sh -c -a ${{ matrix.arch }} env: NDK_PATH: ${{github.workspace}}/android-ndk-r25b # NOTE: this is sneaky, we are adding multiple files from the matrix jobs into the same artifact