diff --git a/.github/workflows/unity.yml b/.github/workflows/unity.yml index eee051c..3c84b58 100644 --- a/.github/workflows/unity.yml +++ b/.github/workflows/unity.yml @@ -9,14 +9,15 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: | ~/Unity/Hub/Editor ~/.config/unityhub - key: unity-2020.3.22f1 + ~/.local/share/unity3d/Unity/Unity_lic.ulf + key: unity-${{ hashFiles('./Reactor.Assets/ProjectSettings/ProjectVersion.txt') }} - name: Setup Unity uses: js6pak/setup-unity@master @@ -25,17 +26,17 @@ jobs: unity-modules: windows-mono android - name: Activate Unity - uses: js6pak/activate-unity@master - with: - unity-username: ${{ secrets.UNITY_USERNAME }} - unity-password: ${{ secrets.UNITY_PASSWORD }} - unity-authenticator-key: ${{ secrets.UNITY_AUTHENTICATOR_KEY }} + env: + UNITY_USERNAME: ${{ secrets.UNITY_USERNAME }} + UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }} + run: | + /opt/unityhub/UnityLicensingClient_V1/Unity.Licensing.Client --activate-ulf --username "$UNITY_USERNAME" --password "$UNITY_PASSWORD" - name: Build working-directory: ./Reactor.Assets run: bash ./build.sh - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: bundles path: ./Reactor/Assets/*.bundle diff --git a/Reactor.Assets/Packages/manifest.json b/Reactor.Assets/Packages/manifest.json index e8635bd..e116e09 100644 --- a/Reactor.Assets/Packages/manifest.json +++ b/Reactor.Assets/Packages/manifest.json @@ -1,10 +1,10 @@ { "dependencies": { "com.unity.2d.sprite": "1.0.0", - "com.unity.ide.rider": "2.0.7", - "com.unity.ide.visualstudio": "2.0.16", + "com.unity.ide.rider": "3.0.31", + "com.unity.ide.visualstudio": "2.0.22", "com.unity.ide.vscode": "1.2.5", - "com.unity.toolchain.linux-x86_64": "2.0.2", + "com.unity.toolchain.linux-x86_64": "2.0.9", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", diff --git a/Reactor.Assets/Packages/packages-lock.json b/Reactor.Assets/Packages/packages-lock.json index 36e8baf..8509b11 100644 --- a/Reactor.Assets/Packages/packages-lock.json +++ b/Reactor.Assets/Packages/packages-lock.json @@ -8,22 +8,22 @@ }, "com.unity.ext.nunit": { "version": "1.0.6", - "depth": 2, + "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "2.0.7", + "version": "3.0.31", "depth": 0, "source": "registry", "dependencies": { - "com.unity.test-framework": "1.1.1" + "com.unity.ext.nunit": "1.0.6" }, "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.16", + "version": "2.0.22", "depth": 0, "source": "registry", "dependencies": { @@ -39,23 +39,23 @@ "url": "https://packages.unity.com" }, "com.unity.sysroot": { - "version": "2.0.3", + "version": "2.0.10", "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.sysroot.linux-x86_64": { - "version": "2.0.2", + "version": "2.0.9", "depth": 1, "source": "registry", "dependencies": { - "com.unity.sysroot": "2.0.3" + "com.unity.sysroot": "2.0.10" }, "url": "https://packages.unity.com" }, "com.unity.test-framework": { - "version": "1.1.29", + "version": "1.1.33", "depth": 1, "source": "registry", "dependencies": { @@ -66,12 +66,12 @@ "url": "https://packages.unity.com" }, "com.unity.toolchain.linux-x86_64": { - "version": "2.0.2", + "version": "2.0.9", "depth": 0, "source": "registry", "dependencies": { - "com.unity.sysroot": "2.0.3", - "com.unity.sysroot.linux-x86_64": "2.0.2" + "com.unity.sysroot": "2.0.10", + "com.unity.sysroot.linux-x86_64": "2.0.9" }, "url": "https://packages.unity.com" }, diff --git a/Reactor.Assets/ProjectSettings/ProjectVersion.txt b/Reactor.Assets/ProjectSettings/ProjectVersion.txt index 2b4e8e5..44822a7 100644 --- a/Reactor.Assets/ProjectSettings/ProjectVersion.txt +++ b/Reactor.Assets/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2020.3.22f1 -m_EditorVersionWithRevision: 2020.3.22f1 (e1a7f79fd887) +m_EditorVersion: 2020.3.45f1 +m_EditorVersionWithRevision: 2020.3.45f1 (660cd1701bd5) diff --git a/Reactor.Assets/build.sh b/Reactor.Assets/build.sh index 3c37354..1d42dc6 100644 --- a/Reactor.Assets/build.sh +++ b/Reactor.Assets/build.sh @@ -1,12 +1,12 @@ #!/bin/bash -UNITY_VERSION=2020.3.22f1 +UNITY_VERSION=2020.3.45f1 if [[ ! -v UNITY_PATH ]]; then if command -v unityhub &>/dev/null; then echo "Trying to get unity path from unityhub..." - UNITYHUB_INSTALL_PATH=$(unityhub --headless install-path) + UNITYHUB_INSTALL_PATH=$(unityhub -- --headless install-path) UNITY_PATH="$UNITYHUB_INSTALL_PATH/$UNITY_VERSION/Editor/Unity" if [[ ! -f $UNITY_PATH ]]; then @@ -22,4 +22,4 @@ fi echo "UNITY_PATH = $UNITY_PATH" rm Library -rf # TODO figure out why having Library cached makes invalid bundles in batchmode -$UNITY_PATH -batchmode -nographics -quit -logFile "-" -projectPath $pwd -executeMethod Build.BuildAssetBundles +"$UNITY_PATH" -batchmode -nographics -quit -logFile "-" -projectPath "$PWD" -executeMethod Build.BuildAssetBundles diff --git a/Reactor/Assets/default-android.bundle b/Reactor/Assets/default-android.bundle index c81b505..844ba24 100644 Binary files a/Reactor/Assets/default-android.bundle and b/Reactor/Assets/default-android.bundle differ diff --git a/Reactor/Assets/default-win-x86.bundle b/Reactor/Assets/default-win-x86.bundle index 4421b3a..791e054 100644 Binary files a/Reactor/Assets/default-win-x86.bundle and b/Reactor/Assets/default-win-x86.bundle differ