From bba4556bd14fff650301ba9b5f1b5bd91541a5eb Mon Sep 17 00:00:00 2001 From: Joni Savolainen Date: Sat, 13 Sep 2025 18:47:08 +0300 Subject: [PATCH 1/2] chore(project): upgrade to Unity 2022.3.62f1 --- .github/workflows/ci.yml | 10 ++++++---- Packages/manifest.json | 6 +++--- Packages/packages-lock.json | 14 ++++---------- ProjectSettings/ProjectVersion.txt | 4 ++-- 4 files changed, 15 insertions(+), 19 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ce0d401..ed5c07e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,8 +18,9 @@ jobs: unityVersion: - 2021.3.3f1 - 2021.3.45f1 - - 2022.3.53f1 - - 6000.0.29f1 + - 2022.3.62f1 + - 6000.0.57f1 + - 6000.2.4f1 targetPlatform: - StandaloneLinux64 - StandaloneWindows64 @@ -29,7 +30,7 @@ jobs: with: fetch-depth: 0 - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: Library key: Library-${{ matrix.targetPlatform }}-${{ matrix.unityVersion }}-${{ hashFiles('Assets/**', 'Packages/**', 'ProjectSettings/**') }} @@ -50,11 +51,12 @@ jobs: githubToken: ${{ secrets.GITHUB_TOKEN }} customParameters: -debugCodeOptimization -enableCodeCoverage -coverageResultsPath ./CodeCoverage -coverageOptions "useProjectSettings;generateAdditionalMetrics" - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 if: always() with: name: Test results (all modes) path: ${{ steps.testRunner.outputs.artifactsPath }} + overwrite: true - name: Upload code coverage to Codecov uses: codecov/codecov-action@v3 diff --git a/Packages/manifest.json b/Packages/manifest.json index 29459b1..896ce3c 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,11 +1,11 @@ { "dependencies": { "com.marijnzwemmer.unity-toolbar-extender": "1.4.2", - "com.unity.ide.rider": "3.0.34", - "com.unity.ide.visualstudio": "2.0.22", + "com.unity.ide.rider": "3.0.37", + "com.unity.ide.visualstudio": "2.0.23", "com.unity.ide.vscode": "1.2.5", "com.unity.test-framework": "1.1.33", - "com.unity.testtools.codecoverage": "1.2.6", + "com.unity.testtools.codecoverage": "1.2.7", "com.unity.ugui": "1.0.0", "io.savolainen.uicomponents": "1.0.0-beta.9", "com.unity.modules.ai": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 19a5a75..f5bb370 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -15,7 +15,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.34", + "version": "3.0.37", "depth": 0, "source": "registry", "dependencies": { @@ -24,7 +24,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.22", + "version": "2.0.23", "depth": 0, "source": "registry", "dependencies": { @@ -40,7 +40,7 @@ "url": "https://packages.unity.com" }, "com.unity.settings-manager": { - "version": "2.0.1", + "version": "2.1.0", "depth": 1, "source": "registry", "dependencies": {}, @@ -58,7 +58,7 @@ "url": "https://packages.unity.com" }, "com.unity.testtools.codecoverage": { - "version": "1.2.6", + "version": "1.2.7", "depth": 0, "source": "registry", "dependencies": { @@ -76,12 +76,6 @@ "com.unity.modules.imgui": "1.0.0" } }, - "io.savolainen.test": { - "version": "file:io.savolainen.test", - "depth": 0, - "source": "embedded", - "dependencies": {} - }, "io.savolainen.uicomponents": { "version": "1.0.0-beta.9", "depth": 0, diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index ba6dfe7..7a6f40b 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2022.3.53f1 -m_EditorVersionWithRevision: 2022.3.53f1 (df4e529d20d3) +m_EditorVersion: 2022.3.62f1 +m_EditorVersionWithRevision: 2022.3.62f1 (4af31df58517) From 0c00d0e100f7a3d335980764439a244d248d61e9 Mon Sep 17 00:00:00 2001 From: Joni Savolainen Date: Sat, 13 Sep 2025 18:57:21 +0300 Subject: [PATCH 2/2] ci: use unique artifact name for test results --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ed5c07e..2d86516 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -54,7 +54,7 @@ jobs: - uses: actions/upload-artifact@v4 if: always() with: - name: Test results (all modes) + name: Test results for ${{ matrix.targetPlatform }} on ${{ matrix.unityVersion }} path: ${{ steps.testRunner.outputs.artifactsPath }} overwrite: true