From 0e0eb4e72892ef9be766aa76add6bb4a13767bc4 Mon Sep 17 00:00:00 2001
From: Joni Savolainen <joni@savolainen.io>
Date: Sat, 19 Oct 2024 09:50:01 +0300
Subject: [PATCH 1/2] chore(project): upgrade to Unity 2021.3.45f1,
UIComponents 1.0.0-beta.9
---
.github/workflows/ci.yml | 6 +++---
.../Core/GitProcessTests.cs | 4 ++--
Packages/io.savolainen.unitygit-tests/package.json | 2 +-
Packages/io.savolainen.unitygit/package.json | 2 +-
Packages/manifest.json | 6 +++---
Packages/packages-lock.json | 10 +++++-----
.../com.unity.testtools.codecoverage/Settings.json | 5 +++++
ProjectSettings/ProjectVersion.txt | 4 ++--
8 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d4723ce..c9c7a4c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,9 +17,9 @@ jobs:
matrix:
unityVersion:
- 2021.3.3f1
- - 2021.3.34f1
- - 2022.3.18f1
- - 2023.2.7f1
+ - 2021.3.45f1
+ - 2022.3.50f1
+ - 6000.0.23f1
targetPlatform:
- StandaloneLinux64
- StandaloneWindows64
diff --git a/Packages/io.savolainen.unitygit-tests/Core/GitProcessTests.cs b/Packages/io.savolainen.unitygit-tests/Core/GitProcessTests.cs
index 1f06e87..9cf964d 100644
--- a/Packages/io.savolainen.unitygit-tests/Core/GitProcessTests.cs
+++ b/Packages/io.savolainen.unitygit-tests/Core/GitProcessTests.cs
@@ -66,7 +66,7 @@ public IEnumerator It_Times_Out_After_Given_Milliseconds()
// Ping is used instead, which is pretty hacky.
fileName = "ping";
arguments = "-n 5 127.0.0.1";
- expectedLines = 2;
+ expectedLines = 3;
}
else
{
@@ -80,7 +80,7 @@ public IEnumerator It_Times_Out_After_Given_Milliseconds()
process.StartInfo.WorkingDirectory = Directory.GetCurrentDirectory();
var gitProcess = new GitProcess(process);
- gitProcess.SetTimeout(10);
+ gitProcess.SetTimeout(100);
var task = gitProcess.Run();
diff --git a/Packages/io.savolainen.unitygit-tests/package.json b/Packages/io.savolainen.unitygit-tests/package.json
index ad97bcf..40402f3 100644
--- a/Packages/io.savolainen.unitygit-tests/package.json
+++ b/Packages/io.savolainen.unitygit-tests/package.json
@@ -10,6 +10,6 @@
"url": "https://savolainen.io"
},
"dependencies": {
- "io.savolainen.uicomponents": "1.0.0-beta.3"
+ "io.savolainen.uicomponents": "1.0.0-beta.9"
}
}
diff --git a/Packages/io.savolainen.unitygit/package.json b/Packages/io.savolainen.unitygit/package.json
index 9cafcab..c3ede3f 100644
--- a/Packages/io.savolainen.unitygit/package.json
+++ b/Packages/io.savolainen.unitygit/package.json
@@ -10,7 +10,7 @@
"url": "https://savolainen.io"
},
"dependencies": {
- "io.savolainen.uicomponents": "1.0.0-beta.3",
+ "io.savolainen.uicomponents": "1.0.0-beta.9",
"com.marijnzwemmer.unity-toolbar-extender": "1.4.2"
}
}
diff --git a/Packages/manifest.json b/Packages/manifest.json
index c4a5508..d457d21 100644
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
@@ -1,14 +1,14 @@
{
"dependencies": {
"com.marijnzwemmer.unity-toolbar-extender": "1.4.2",
- "com.unity.ide.rider": "3.0.27",
+ "com.unity.ide.rider": "3.0.31",
"com.unity.ide.visualstudio": "2.0.22",
"com.unity.ide.vscode": "1.2.5",
"com.unity.test-framework": "1.1.33",
- "com.unity.testtools.codecoverage": "1.2.5",
+ "com.unity.testtools.codecoverage": "1.2.6",
"com.unity.textmeshpro": "3.0.7",
"com.unity.ugui": "1.0.0",
- "io.savolainen.uicomponents": "1.0.0-beta.8",
+ "io.savolainen.uicomponents": "1.0.0-beta.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/Packages/packages-lock.json b/Packages/packages-lock.json
index 4e83922..7ee7afd 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.27",
+ "version": "3.0.31",
"depth": 0,
"source": "registry",
"dependencies": {
@@ -58,7 +58,7 @@
"url": "https://packages.unity.com"
},
"com.unity.testtools.codecoverage": {
- "version": "1.2.5",
+ "version": "1.2.6",
"depth": 0,
"source": "registry",
"dependencies": {
@@ -92,7 +92,7 @@
"dependencies": {}
},
"io.savolainen.uicomponents": {
- "version": "1.0.0-beta.8",
+ "version": "1.0.0-beta.9",
"depth": 0,
"source": "registry",
"dependencies": {},
@@ -103,7 +103,7 @@
"depth": 0,
"source": "embedded",
"dependencies": {
- "io.savolainen.uicomponents": "1.0.0-beta.3",
+ "io.savolainen.uicomponents": "1.0.0-beta.9",
"com.marijnzwemmer.unity-toolbar-extender": "1.4.2"
}
},
@@ -112,7 +112,7 @@
"depth": 0,
"source": "embedded",
"dependencies": {
- "io.savolainen.uicomponents": "1.0.0-beta.3"
+ "io.savolainen.uicomponents": "1.0.0-beta.9"
}
},
"com.unity.modules.ai": {
diff --git a/ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json b/ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json
index 6b5d9de..8e9fce6 100644
--- a/ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json
+++ b/ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json
@@ -22,6 +22,11 @@
"type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
"key": "EnableCodeCoverage",
"value": "{\"m_Value\":true}"
+ },
+ {
+ "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
+ "key": "OpenReportWhenGenerated",
+ "value": "{\"m_Value\":false}"
}
]
}
diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
index 03cda39..8386a05 100644
--- a/ProjectSettings/ProjectVersion.txt
+++ b/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2021.3.34f1
-m_EditorVersionWithRevision: 2021.3.34f1 (25266724e7bd)
+m_EditorVersion: 2021.3.45f1
+m_EditorVersionWithRevision: 2021.3.45f1 (0da89fac8e79)
From 771a862b7cb1464b34d03c5389c59195da49914b Mon Sep 17 00:00:00 2001
From: Joni Savolainen <joni@savolainen.io>
Date: Sat, 19 Oct 2024 10:36:12 +0300
Subject: [PATCH 2/2] ci: do not run build step on Windows
The additional build step causes game-ci's Docker containers to run out of disk space on Windows.
---
.github/workflows/ci.yml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c9c7a4c..f168d45 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -71,7 +71,10 @@ jobs:
git add -A
git commit -m "chore(ci): switch to different unity version" || echo skipping commit
+ # Unfortunately, the additional build step causes game-ci's
+ # Docker containers to run out of disk space on Windows.
- uses: game-ci/unity-builder@v4
+ if: ${{ matrix.targetPlatform != 'StandaloneWindows64' }}
env:
UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}