Skip to content

chore: Added Unity 6.1 to CI #2130

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.

Sign up for GitHub

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

Merged
merged 13 commits into from
Jul 22, 2025
Merged

chore: Added Unity 6.1 to CI #2130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
fd47e72
added 6100
bitsandfoxes Apr 28, 2025
11ab0df
missed a spot
bitsandfoxes Apr 28, 2025
0c620ec
bumped to 6.1.1
bitsandfoxes May 7, 2025
1be507f
Merge branch 'main' into chore/ci-add-6100
bitsandfoxes May 8, 2025
bb4a68a
bumped to 6.1.2
bitsandfoxes May 14, 2025
bede430
Merge branch 'chore/ci-add-6100' of https://github.com/getsentry/sent…
bitsandfoxes May 14, 2025
2e0d0e7
Apply suggestions from code review
bitsandfoxes May 14, 2025
a892640
missed one
bitsandfoxes May 14, 2025
18160fe
bumped to 6.1.8
bitsandfoxes Jun 26, 2025
b28b5c8
merged screenshot fix into this
bitsandfoxes Jul 21, 2025
cf27779
is the workaround still required?
bitsandfoxes Jul 22, 2025
ba110a1
Merge branch 'fix/screenshot-capture' into chore/ci-add-6100
bitsandfoxes Jul 22, 2025
d143a3b
Merge branch 'fix/screenshot-capture' into chore/ci-add-6100
bitsandfoxes Jul 22, 2025
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
18 changes: 9 additions & 9 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ jobs:
strategy:
fail-fast: false
matrix:
unity-version: ["2020", "2022", "6000"]
unity-version: ["2020", "2022", "6000", "6100"]
uses: ./.github/workflows/smoke-test-create.yml
with:
unity-version: ${{ matrix.unity-version }}
Expand All @@ -101,7 +101,7 @@ jobs:
strategy:
fail-fast: false
matrix:
unity-version: ["2020", "2022", "6000"]
unity-version: ["2020", "2022", "6000", "6100"]
platform: ["WebGL", "Linux"]
include:
- platform: WebGL
Expand Down Expand Up @@ -205,7 +205,7 @@ jobs:
strategy:
fail-fast: false
matrix:
unity-version: ["2020", "2022", "6000"]
unity-version: ["2020", "2022", "6000", "6100"]
uses: ./.github/workflows/smoke-test-build-android.yml
with:
unity-version: ${{ matrix.unity-version }}
Expand All @@ -224,7 +224,7 @@ jobs:
matrix:
api-level: [30, 31, 34] # last updated January 2025
init-type: ["runtime", "buildtime"]
unity-version: ["2020", "2022", "6000"]
unity-version: ["2020", "2022", "6000", "6100"]

smoke-test-build-ios:
name: Build iOS ${{ matrix.unity-version }} Smoke Test
Expand All @@ -234,7 +234,7 @@ jobs:
strategy:
fail-fast: false
matrix:
unity-version: ["2020", "2022", "6000"]
unity-version: ["2020", "2022", "6000", "6100"]
uses: ./.github/workflows/smoke-test-build-ios.yml
with:
unity-version: ${{ matrix.unity-version }}
Expand All @@ -247,7 +247,7 @@ jobs:
strategy:
fail-fast: false
matrix:
unity-version: ["2020", "2022", "6000"]
unity-version: ["2020", "2022", "6000", "6100"]
init-type: ["runtime", "buildtime"]
uses: ./.github/workflows/smoke-test-compile-ios.yml
with:
Expand All @@ -266,7 +266,7 @@ jobs:
strategy:
fail-fast: false
matrix:
unity-version: ["2020", "2022", "6000"]
unity-version: ["2020", "2022", "6000", "6100"]
# Check https://support.apple.com/en-us/HT201222 for the latest minor version for a given major one.
# https://developer.apple.com/support/app-store/ shows that of all iOS devices
# - `iOS 17`: 86 %
Expand All @@ -287,7 +287,7 @@ jobs:
strategy:
fail-fast: false
matrix:
unity-version: ["2020", "2022", "6000"]
unity-version: ["2020", "2022", "6000", "6100"]
platform: ["WebGL", "Linux"]
steps:
- name: Checkout
Expand Down Expand Up @@ -325,7 +325,7 @@ jobs:
strategy:
fail-fast: false
matrix:
unity-version: ["2020", "2022", "6000"]
unity-version: ["2020", "2022", "6000", "6100"]
# os: ["windows", "macos"]
os: ["windows"]
include:
Expand Down
3 changes: 3 additions & 0 deletions scripts/ci-env.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ switch ($name) {
"unity6000" {
return "6000.0.49f1"
}
"unity6100" {
return "6000.1.12f1"
}
Default {
throw "Unkown variable '$name'"
}
Expand Down
8 changes: 0 additions & 8 deletions test/Scripts.Integration.Test/Editor/Builder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,6 @@ public static void BuildIl2CPPPlayer(BuildTarget target, BuildTargetGroup group,
PlayerSettings.SetManagedStrippingLevel(group, ManagedStrippingLevel.Low);
#endif


// This is a workaround for build issues with Unity 2022.3. and newer.
// https://discussions.unity.com/t/gradle-build-issues-for-android-api-sdk-35-in-unity-2022-3lts/1502187/10
#if UNITY_2022_3_OR_NEWER
Debug.Log("Builder: Setting Android target API level to 33");
PlayerSettings.Android.targetSdkVersion = AndroidSdkVersions.AndroidApiLevel33;
#endif
Comment on lines -47 to -52
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The workaround is no longer needed. Newer Unity versions do not have this issue anymore.


Debug.Log("Builder: Updating BuildPlayerOptions");
var buildPlayerOptions = new BuildPlayerOptions
{
Expand Down
Loading