From 61108cc02e3e86e60793a96466753b4ca6f7b025 Mon Sep 17 00:00:00 2001 From: The Judge Date: Thu, 13 Jun 2024 23:00:47 -0700 Subject: [PATCH 01/13] Begin wrapper workflow --- .github/workflows/main.yml | 94 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 00000000..b945328c --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,94 @@ +name: Build Wrapper + +on: [push, workflow_dispatch] + +jobs: + build: + name: Build Wrapper + runs-on: ubuntu-latest + steps: + # Checkout + - name: Checkout repository + uses: actions/checkout@v4 + + # Cache + - uses: actions/cache@v3 + with: + path: Library + key: Library-${{ hashFiles('Assets/**', 'Packages/**', 'ProjectSettings/**') }} + restore-keys: | + Library- + + # Build + - name: Build APK + uses: game-ci/unity-builder@v4 + env: + UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }} + UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }} + UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }} + with: + targetPlatform: Android + customImage: 'unityci/editor:ubuntu-2021.3.37f1-android-3.1.0' + androidExportType: androidPackage + androidKeystoreName: user.keystore + androidKeystoreBase64: ${{ secrets.ANDROID_KEYSTORE_BASE64 }} + androidKeystorePass: ${{ secrets.ANDROID_KEYSTORE_PASS }} + androidKeyaliasName: ${{ secrets.ANDROID_KEYALIAS_NAME }} + androidKeyaliasPass: ${{ secrets.ANDROID_KEYALIAS_PASS }} + + # Export + - name: Export Project + uses: game-ci/unity-builder@v4 + env: + UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }} + UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }} + UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }} + with: + targetPlatform: Android + customImage: 'unityci/editor:ubuntu-2021.3.37f1-android-3.1.0' + buildsPath: exported + androidExportType: androidStudioProject + androidKeystoreName: qcxr.keystore + androidKeystoreBase64: ${{ secrets.ANDROID_KEYSTORE_BASE64 }} + androidKeystorePass: ${{ secrets.ANDROID_KEYSTORE_PASS }} + androidKeyaliasName: ${{ secrets.ANDROID_KEYALIAS_NAME }} + androidKeyaliasPass: ${{ secrets.ANDROID_KEYALIAS_PASS }} + + # Upload exported Android Studio project + - uses: actions/upload-artifact@v3 + with: + name: Exported + path: exported + update: + name: Update IL2CPP repo + runs-on: ubuntu-latest + needs: build + steps: + - name: Checkout repository + uses: actions/checkout@v4 + with: + repository: QuestCraftPlusPlus/Wrapper-IL2CPP + - name: Grab IL2CPP changes + uses: actions/download-artifact@v4 + with: + name: Exported + run: | + cp -rf ${{ GITHUB_WORKSPACE }}/Exported/Android/unityLibrary/src/main/assets unityLibrary/src/main/assets + cp -rf ${{ GITHUB_WORKSPACE }}/Exported/Android/unityLibrary/src/main/jniLibs unityLibrary/src/main/jniLibs + cp -rf ${{ GITHUB_WORKSPACE }}/Exported/Android/unityLibrary/src/main/Il2CppOutputProject unityLibrary/src/main/Il2CppOutputProject + cp -rf ${{ GITHUB_WORKSPACE }}/Exported/Android/unityLibrary/src/main/jniStaticLibs unityLibrary/src/main/jniStaticLibs + cp -rf ${{ GITHUB_WORKSPACE }}/Exported/Android/unityLibrary/src/main/res unityLibrary/src/main/res + cp -rf ${{ GITHUB_WORKSPACE }}/Exported/Android/unityLibrary/src/main/resources unityLibrary/src/main/resources + cp -rf ${{ GITHUB_WORKSPACE }}/Exported/Android/launcher/src/main/res launcher/src/main/res + cp -f ${{ GITHUB_WORKSPACE }}/Exported/Android/unityLibrary/src/main/AndroidManifest.xml unityLibrary/src/main/AndroidManifest.xml + cp -f ${{ GITHUB_WORKSPACE }}/Exported/Android/launcher/src/main/AndroidManifest.xml launcher/src/main/AndroidManifest.xml + - name: Commit files + run: | + git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com" + git config --local user.name "github-actions[bot]" + git commit -a -m "Auto-update" + - name: Push changes + uses: ad-m/github-push-action@master + with: + repository: QuestCraftPlusPlus/Wrapper-IL2CPP + github_token: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file From c4273cbb81a55f121f2d82db9589487dbefff8d3 Mon Sep 17 00:00:00 2001 From: The Judge <53906078+thejudge156@users.noreply.github.com> Date: Thu, 13 Jun 2024 23:04:16 -0700 Subject: [PATCH 02/13] Update main.yml (#32) --- .github/workflows/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b945328c..138daff2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -72,6 +72,7 @@ jobs: uses: actions/download-artifact@v4 with: name: Exported + - name: Copy Changes run: | cp -rf ${{ GITHUB_WORKSPACE }}/Exported/Android/unityLibrary/src/main/assets unityLibrary/src/main/assets cp -rf ${{ GITHUB_WORKSPACE }}/Exported/Android/unityLibrary/src/main/jniLibs unityLibrary/src/main/jniLibs @@ -91,4 +92,4 @@ jobs: uses: ad-m/github-push-action@master with: repository: QuestCraftPlusPlus/Wrapper-IL2CPP - github_token: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + github_token: ${{ secrets.GITHUB_TOKEN }} From bc6e7a8c7b327112642b02afce44947225ced454 Mon Sep 17 00:00:00 2001 From: The Judge Date: Thu, 13 Jun 2024 23:05:20 -0700 Subject: [PATCH 03/13] Correct env var usage --- .github/workflows/main.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 138daff2..c429cb17 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -74,15 +74,15 @@ jobs: name: Exported - name: Copy Changes run: | - cp -rf ${{ GITHUB_WORKSPACE }}/Exported/Android/unityLibrary/src/main/assets unityLibrary/src/main/assets - cp -rf ${{ GITHUB_WORKSPACE }}/Exported/Android/unityLibrary/src/main/jniLibs unityLibrary/src/main/jniLibs - cp -rf ${{ GITHUB_WORKSPACE }}/Exported/Android/unityLibrary/src/main/Il2CppOutputProject unityLibrary/src/main/Il2CppOutputProject - cp -rf ${{ GITHUB_WORKSPACE }}/Exported/Android/unityLibrary/src/main/jniStaticLibs unityLibrary/src/main/jniStaticLibs - cp -rf ${{ GITHUB_WORKSPACE }}/Exported/Android/unityLibrary/src/main/res unityLibrary/src/main/res - cp -rf ${{ GITHUB_WORKSPACE }}/Exported/Android/unityLibrary/src/main/resources unityLibrary/src/main/resources - cp -rf ${{ GITHUB_WORKSPACE }}/Exported/Android/launcher/src/main/res launcher/src/main/res - cp -f ${{ GITHUB_WORKSPACE }}/Exported/Android/unityLibrary/src/main/AndroidManifest.xml unityLibrary/src/main/AndroidManifest.xml - cp -f ${{ GITHUB_WORKSPACE }}/Exported/Android/launcher/src/main/AndroidManifest.xml launcher/src/main/AndroidManifest.xml + cp -rf $GITHUB_WORKSPACE/Exported/Android/unityLibrary/src/main/assets unityLibrary/src/main/assets + cp -rf $GITHUB_WORKSPACE/Exported/Android/unityLibrary/src/main/jniLibs unityLibrary/src/main/jniLibs + cp -rf $GITHUB_WORKSPACE/Exported/Android/unityLibrary/src/main/Il2CppOutputProject unityLibrary/src/main/Il2CppOutputProject + cp -rf $GITHUB_WORKSPACE/Exported/Android/unityLibrary/src/main/jniStaticLibs unityLibrary/src/main/jniStaticLibs + cp -rf $GITHUB_WORKSPACE/Exported/Android/unityLibrary/src/main/res unityLibrary/src/main/res + cp -rf $GITHUB_WORKSPACE/Exported/Android/unityLibrary/src/main/resources unityLibrary/src/main/resources + cp -rf $GITHUB_WORKSPACE/Exported/Android/launcher/src/main/res launcher/src/main/res + cp -f $GITHUB_WORKSPACE/Exported/Android/unityLibrary/src/main/AndroidManifest.xml unityLibrary/src/main/AndroidManifest.xml + cp -f $GITHUB_WORKSPACE/Exported/Android/launcher/src/main/AndroidManifest.xml launcher/src/main/AndroidManifest.xml - name: Commit files run: | git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com" From 08187dc215412826bf133556de04bfd32e2ad8ed Mon Sep 17 00:00:00 2001 From: The Judge Date: Thu, 13 Jun 2024 23:11:57 -0700 Subject: [PATCH 04/13] Specify android target sdk version --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c429cb17..f1a5bba5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,6 +30,7 @@ jobs: targetPlatform: Android customImage: 'unityci/editor:ubuntu-2021.3.37f1-android-3.1.0' androidExportType: androidPackage + androidTargetSdkVersion: 32 androidKeystoreName: user.keystore androidKeystoreBase64: ${{ secrets.ANDROID_KEYSTORE_BASE64 }} androidKeystorePass: ${{ secrets.ANDROID_KEYSTORE_PASS }} @@ -48,6 +49,7 @@ jobs: customImage: 'unityci/editor:ubuntu-2021.3.37f1-android-3.1.0' buildsPath: exported androidExportType: androidStudioProject + androidTargetSdkVersion: 32 androidKeystoreName: qcxr.keystore androidKeystoreBase64: ${{ secrets.ANDROID_KEYSTORE_BASE64 }} androidKeystorePass: ${{ secrets.ANDROID_KEYSTORE_PASS }} From a8f998316dec81bf34ed39d4574aeaccb94efe47 Mon Sep 17 00:00:00 2001 From: The Judge Date: Thu, 13 Jun 2024 23:30:37 -0700 Subject: [PATCH 05/13] Free space up --- .github/workflows/main.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f1a5bba5..b5f619a9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,6 +10,14 @@ jobs: # Checkout - name: Checkout repository uses: actions/checkout@v4 + + - name: Free Disk Space for Android + run: | + sudo swapoff -a + sudo rm -f /swapfile + sudo apt clean + docker rmi $(docker images -q) + df -h # Cache - uses: actions/cache@v3 From 46d01904bb46f4e9acd82f74895e42703794aefc Mon Sep 17 00:00:00 2001 From: The Judge <53906078+thejudge156@users.noreply.github.com> Date: Thu, 13 Jun 2024 23:43:01 -0700 Subject: [PATCH 06/13] Update main.yml (#33) --- .github/workflows/main.yml | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b5f619a9..909f7da3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -11,13 +11,20 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - - name: Free Disk Space for Android - run: | - sudo swapoff -a - sudo rm -f /swapfile - sudo apt clean - docker rmi $(docker images -q) - df -h + - name: Free Disk Space (Ubuntu) + uses: jlumbroso/free-disk-space@main + with: + # this might remove tools that are actually needed, + # if set to "true" but frees about 6 GB + tool-cache: true + # all of these default to true, but feel free to set to + # "false" if necessary for your workflow + android: false + dotnet: true + haskell: true + large-packages: true + docker-images: true + swap-storage: true # Cache - uses: actions/cache@v3 From 44da8dd1eca660657f5c8f1cfb6077a257d3d07f Mon Sep 17 00:00:00 2001 From: The Judge Date: Fri, 14 Jun 2024 00:00:52 -0700 Subject: [PATCH 07/13] Remove cross compilation tools --- Packages/manifest.json | 12 +++++------- Packages/packages-lock.json | 38 +------------------------------------ 2 files changed, 6 insertions(+), 44 deletions(-) diff --git a/Packages/manifest.json b/Packages/manifest.json index 99e35dff..ab4ce69a 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,5 +1,6 @@ { "dependencies": { + "com.netpyoung.webp": "https://github.com/netpyoung/unity.webp.git?path=unity_project/Assets/unity.webp#0.3.9", "com.unity.2d.sprite": "1.0.0", "com.unity.collab-proxy": "2.3.1", "com.unity.feature.development": "1.0.1", @@ -9,15 +10,14 @@ "com.unity.test-framework": "1.1.33", "com.unity.textmeshpro": "3.0.6", "com.unity.timeline": "1.6.5", - "com.unity.toolchain.macos-arm64-linux-x86_64": "2.0.0", - "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.6", "com.unity.ugui": "1.0.0", - "com.unity.visualscripting": "1.9.2", + "com.unity.visualscripting": "1.9.4", "com.unity.xr.core-utils": "2.3.0", "com.unity.xr.interaction.toolkit": "2.5.2", "com.unity.xr.management": "4.4.1", "com.unity.xr.openxr": "1.10.0", "com.unity.xr.openxr.picoxr": "file:LocalPackages/PICO Unity OpenXR Integration SDK_120", + "org.nuget.system.runtime.compilerservices.unsafe": "6.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", @@ -48,9 +48,7 @@ "com.unity.modules.video": "1.0.0", "com.unity.modules.vr": "1.0.0", "com.unity.modules.wind": "1.0.0", - "com.unity.modules.xr": "1.0.0", - "com.netpyoung.webp": "https://github.com/netpyoung/unity.webp.git?path=unity_project/Assets/unity.webp#0.3.9", - "org.nuget.system.runtime.compilerservices.unsafe": "6.0.0" + "com.unity.modules.xr": "1.0.0" }, "scopedRegistries": [ { @@ -61,4 +59,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 1a002275..c306b1a4 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -103,22 +103,6 @@ "dependencies": {}, "url": "https://packages.unity.com" }, - "com.unity.sysroot": { - "version": "2.0.7", - "depth": 1, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" - }, - "com.unity.sysroot.linux-x86_64": { - "version": "2.0.6", - "depth": 1, - "source": "registry", - "dependencies": { - "com.unity.sysroot": "2.0.7" - }, - "url": "https://packages.unity.com" - }, "com.unity.test-framework": { "version": "1.1.33", "depth": 0, @@ -161,26 +145,6 @@ }, "url": "https://packages.unity.com" }, - "com.unity.toolchain.macos-arm64-linux-x86_64": { - "version": "2.0.0", - "depth": 0, - "source": "registry", - "dependencies": { - "com.unity.sysroot": "2.0.7", - "com.unity.sysroot.linux-x86_64": "2.0.6" - }, - "url": "https://packages.unity.com" - }, - "com.unity.toolchain.win-x86_64-linux-x86_64": { - "version": "2.0.6", - "depth": 0, - "source": "registry", - "dependencies": { - "com.unity.sysroot": "2.0.7", - "com.unity.sysroot.linux-x86_64": "2.0.6" - }, - "url": "https://packages.unity.com" - }, "com.unity.ugui": { "version": "1.0.0", "depth": 0, @@ -191,7 +155,7 @@ } }, "com.unity.visualscripting": { - "version": "1.9.2", + "version": "1.9.4", "depth": 0, "source": "registry", "dependencies": { From 09a9c80f8d3542395e388ea4b6e6dbd0f4065980 Mon Sep 17 00:00:00 2001 From: The Judge Date: Fri, 14 Jun 2024 00:09:56 -0700 Subject: [PATCH 08/13] Fix export --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 909f7da3..4d66c76f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -63,6 +63,7 @@ jobs: targetPlatform: Android customImage: 'unityci/editor:ubuntu-2021.3.37f1-android-3.1.0' buildsPath: exported + allowDirtyBuild: true androidExportType: androidStudioProject androidTargetSdkVersion: 32 androidKeystoreName: qcxr.keystore From 48efbf44462e77b7bc355e2dde1c26ba18894688 Mon Sep 17 00:00:00 2001 From: The Judge Date: Fri, 14 Jun 2024 00:35:36 -0700 Subject: [PATCH 09/13] Fix actions/download-artifact@v4 download --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4d66c76f..fa1140e1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -73,7 +73,7 @@ jobs: androidKeyaliasPass: ${{ secrets.ANDROID_KEYALIAS_PASS }} # Upload exported Android Studio project - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: Exported path: exported From 7b849d0055e6893c623881f33ca2712c480c6750 Mon Sep 17 00:00:00 2001 From: The Judge Date: Fri, 14 Jun 2024 00:51:06 -0700 Subject: [PATCH 10/13] Fix paths --- .github/workflows/main.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fa1140e1..e98928c6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -92,15 +92,15 @@ jobs: name: Exported - name: Copy Changes run: | - cp -rf $GITHUB_WORKSPACE/Exported/Android/unityLibrary/src/main/assets unityLibrary/src/main/assets - cp -rf $GITHUB_WORKSPACE/Exported/Android/unityLibrary/src/main/jniLibs unityLibrary/src/main/jniLibs - cp -rf $GITHUB_WORKSPACE/Exported/Android/unityLibrary/src/main/Il2CppOutputProject unityLibrary/src/main/Il2CppOutputProject - cp -rf $GITHUB_WORKSPACE/Exported/Android/unityLibrary/src/main/jniStaticLibs unityLibrary/src/main/jniStaticLibs - cp -rf $GITHUB_WORKSPACE/Exported/Android/unityLibrary/src/main/res unityLibrary/src/main/res - cp -rf $GITHUB_WORKSPACE/Exported/Android/unityLibrary/src/main/resources unityLibrary/src/main/resources - cp -rf $GITHUB_WORKSPACE/Exported/Android/launcher/src/main/res launcher/src/main/res - cp -f $GITHUB_WORKSPACE/Exported/Android/unityLibrary/src/main/AndroidManifest.xml unityLibrary/src/main/AndroidManifest.xml - cp -f $GITHUB_WORKSPACE/Exported/Android/launcher/src/main/AndroidManifest.xml launcher/src/main/AndroidManifest.xml + cp -rf $GITHUB_WORKSPACE/Exported/Android/Android/unityLibrary/src/main/assets unityLibrary/src/main/assets + cp -rf $GITHUB_WORKSPACE/Exported/Android/Android/unityLibrary/src/main/jniLibs unityLibrary/src/main/jniLibs + cp -rf $GITHUB_WORKSPACE/Exported/Android/Android/unityLibrary/src/main/Il2CppOutputProject unityLibrary/src/main/Il2CppOutputProject + cp -rf $GITHUB_WORKSPACE/Exported/Android/Android/unityLibrary/src/main/jniStaticLibs unityLibrary/src/main/jniStaticLibs + cp -rf $GITHUB_WORKSPACE/Exported/Android/Android/unityLibrary/src/main/res unityLibrary/src/main/res + cp -rf $GITHUB_WORKSPACE/Exported/Android/Android/unityLibrary/src/main/resources unityLibrary/src/main/resources + cp -rf $GITHUB_WORKSPACE/Exported/Android/Android/launcher/src/main/res launcher/src/main/res + cp -f $GITHUB_WORKSPACE/Exported/Android/Android/unityLibrary/src/main/AndroidManifest.xml unityLibrary/src/main/AndroidManifest.xml + cp -f $GITHUB_WORKSPACE/Exported/Android/Android/launcher/src/main/AndroidManifest.xml launcher/src/main/AndroidManifest.xml - name: Commit files run: | git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com" From 479d325b71e957d5c2b495cff1fa9c41a66ce26d Mon Sep 17 00:00:00 2001 From: The Judge Date: Fri, 14 Jun 2024 11:06:24 -0700 Subject: [PATCH 11/13] Attempt to fix the path --- .github/workflows/main.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e98928c6..92e5d8f1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -92,15 +92,15 @@ jobs: name: Exported - name: Copy Changes run: | - cp -rf $GITHUB_WORKSPACE/Exported/Android/Android/unityLibrary/src/main/assets unityLibrary/src/main/assets - cp -rf $GITHUB_WORKSPACE/Exported/Android/Android/unityLibrary/src/main/jniLibs unityLibrary/src/main/jniLibs - cp -rf $GITHUB_WORKSPACE/Exported/Android/Android/unityLibrary/src/main/Il2CppOutputProject unityLibrary/src/main/Il2CppOutputProject - cp -rf $GITHUB_WORKSPACE/Exported/Android/Android/unityLibrary/src/main/jniStaticLibs unityLibrary/src/main/jniStaticLibs - cp -rf $GITHUB_WORKSPACE/Exported/Android/Android/unityLibrary/src/main/res unityLibrary/src/main/res - cp -rf $GITHUB_WORKSPACE/Exported/Android/Android/unityLibrary/src/main/resources unityLibrary/src/main/resources - cp -rf $GITHUB_WORKSPACE/Exported/Android/Android/launcher/src/main/res launcher/src/main/res - cp -f $GITHUB_WORKSPACE/Exported/Android/Android/unityLibrary/src/main/AndroidManifest.xml unityLibrary/src/main/AndroidManifest.xml - cp -f $GITHUB_WORKSPACE/Exported/Android/Android/launcher/src/main/AndroidManifest.xml launcher/src/main/AndroidManifest.xml + cp -rf $GITHUB_WORKSPACE/Android/Android/unityLibrary/src/main/assets unityLibrary/src/main/assets + cp -rf $GITHUB_WORKSPACE/Android/Android/unityLibrary/src/main/jniLibs unityLibrary/src/main/jniLibs + cp -rf $GITHUB_WORKSPACE/Android/Android/unityLibrary/src/main/Il2CppOutputProject unityLibrary/src/main/Il2CppOutputProject + cp -rf $GITHUB_WORKSPACE/Android/Android/unityLibrary/src/main/jniStaticLibs unityLibrary/src/main/jniStaticLibs + cp -rf $GITHUB_WORKSPACE/Android/Android/unityLibrary/src/main/res unityLibrary/src/main/res + cp -rf $GITHUB_WORKSPACE/Android/Android/unityLibrary/src/main/resources unityLibrary/src/main/resources + cp -rf $GITHUB_WORKSPACE/Android/Android/launcher/src/main/res launcher/src/main/res + cp -f $GITHUB_WORKSPACE/Android/Android/unityLibrary/src/main/AndroidManifest.xml unityLibrary/src/main/AndroidManifest.xml + cp -f $GITHUB_WORKSPACE/Android/Android/launcher/src/main/AndroidManifest.xml launcher/src/main/AndroidManifest.xml - name: Commit files run: | git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com" From 458dbe73284b5b1c59eeea41969230b79e39774c Mon Sep 17 00:00:00 2001 From: The Judge Date: Fri, 14 Jun 2024 11:30:39 -0700 Subject: [PATCH 12/13] Use PAT for repo update --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 92e5d8f1..21c70789 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -110,4 +110,4 @@ jobs: uses: ad-m/github-push-action@master with: repository: QuestCraftPlusPlus/Wrapper-IL2CPP - github_token: ${{ secrets.GITHUB_TOKEN }} + github_token: ${{ secrets.PERSONAL_TOKEN }} From 32a8188f3b6ce143f20f5c66644af44c9ad8ef3a Mon Sep 17 00:00:00 2001 From: The Judge <53906078+thejudge156@users.noreply.github.com> Date: Fri, 14 Jun 2024 14:40:12 -0700 Subject: [PATCH 13/13] Update main.yml --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 21c70789..06223c11 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -86,6 +86,7 @@ jobs: uses: actions/checkout@v4 with: repository: QuestCraftPlusPlus/Wrapper-IL2CPP + token: ${{ secrets.PERSONAL_TOKEN }} - name: Grab IL2CPP changes uses: actions/download-artifact@v4 with: