Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions Packages/io.savolainen.unitygit-tests/Core/GitProcessTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand All @@ -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();

Expand Down
2 changes: 1 addition & 1 deletion Packages/io.savolainen.unitygit-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
2 changes: 1 addition & 1 deletion Packages/io.savolainen.unitygit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
6 changes: 3 additions & 3 deletions Packages/manifest.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
10 changes: 5 additions & 5 deletions Packages/packages-lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down Expand Up @@ -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": {
Expand Down Expand Up @@ -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": {},
Expand All @@ -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"
}
},
Expand All @@ -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": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
}
]
}
Expand Down
4 changes: 2 additions & 2 deletions ProjectSettings/ProjectVersion.txt
Original file line number Diff line number Diff line change
@@ -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)
Loading