Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(project): upgrade to Unity 2021.3.34f1 #5

Merged
merged 2 commits into from
Jan 28, 2024
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
14 changes: 8 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ jobs:
matrix:
unityVersion:
- 2021.3.3f1
- 2021.3.31f1
- 2022.3.10f1
- 2023.1.16f1
- 2021.3.34f1
- 2022.3.18f1
- 2023.2.7f1
targetPlatform:
- StandaloneLinux64
- StandaloneWindows64

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0

Expand All @@ -38,10 +38,12 @@ jobs:
Library-${{ matrix.targetPlatform }}-
Library-

- uses: game-ci/unity-test-runner@v3
- uses: game-ci/unity-test-runner@v4
id: testRunner
env:
UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
with:
testMode: EditMode
unityVersion: ${{ matrix.unityVersion }}
Expand Down Expand Up @@ -69,7 +71,7 @@ jobs:
git add -A
git commit -m "chore(ci): switch to different unity version" || echo skipping commit

- uses: game-ci/unity-builder@v3
- uses: game-ci/unity-builder@v4
env:
UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
Expand Down
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 = 3;
expectedLines = 2;
}
else
{
Expand Down
7 changes: 3 additions & 4 deletions Packages/manifest.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
{
"dependencies": {
"com.marijnzwemmer.unity-toolbar-extender": "1.4.2",
"com.unity.collab-proxy": "2.1.0",
"com.unity.ide.rider": "3.0.26",
"com.unity.ide.rider": "3.0.27",
"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.4",
"com.unity.textmeshpro": "3.0.6",
"com.unity.testtools.codecoverage": "1.2.5",
"com.unity.textmeshpro": "3.0.7",
"com.unity.ugui": "1.0.0",
"io.savolainen.uicomponents": "1.0.0-beta.8",
"com.unity.modules.ai": "1.0.0",
Expand Down
13 changes: 3 additions & 10 deletions Packages/packages-lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,6 @@
"dependencies": {},
"url": "https://package.openupm.com"
},
"com.unity.collab-proxy": {
"version": "2.1.0",
"depth": 0,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.ext.nunit": {
"version": "1.0.6",
"depth": 1,
Expand All @@ -22,7 +15,7 @@
"url": "https://packages.unity.com"
},
"com.unity.ide.rider": {
"version": "3.0.26",
"version": "3.0.27",
"depth": 0,
"source": "registry",
"dependencies": {
Expand Down Expand Up @@ -65,7 +58,7 @@
"url": "https://packages.unity.com"
},
"com.unity.testtools.codecoverage": {
"version": "1.2.4",
"version": "1.2.5",
"depth": 0,
"source": "registry",
"dependencies": {
Expand All @@ -75,7 +68,7 @@
"url": "https://packages.unity.com"
},
"com.unity.textmeshpro": {
"version": "3.0.6",
"version": "3.0.7",
"depth": 0,
"source": "registry",
"dependencies": {
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.31f1
m_EditorVersionWithRevision: 2021.3.31f1 (3409e2af086f)
m_EditorVersion: 2021.3.34f1
m_EditorVersionWithRevision: 2021.3.34f1 (25266724e7bd)
Loading