Skip to content

Commit 895ef18

Browse files
google-labs-jules[bot]google-labs-jules[bot]
committed
Merge upstream changes from ppy/osu
1 parent 25a1ada commit 895ef18

188 files changed

Lines changed: 2195 additions & 53925 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/ci.yml‎

Lines changed: 16 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ jobs:
1919
uses: actions/setup-dotnet@v4
2020
with:
2121
dotnet-version: "8.0.x"
22-
cache: false
2322

2423
- name: Restore Tools
2524
run: dotnet tool restore
@@ -34,7 +33,7 @@ jobs:
3433
key: inspectcode-${{ hashFiles('.config/dotnet-tools.json', '.github/workflows/ci.yml', 'osu.sln*', 'osu*.slnf', '.editorconfig', '.globalconfig', 'CodeAnalysis/*', '**/*.csproj', '**/*.props') }}
3534

3635
- name: Dotnet code style
37-
run: dotnet build -c Debug -warnaserror osu.Desktop.slnf -p:EnforceCodeStyleInBuild=true --no-restore
36+
run: dotnet build -c Debug -warnaserror osu.Desktop.slnf -p:EnforceCodeStyleInBuild=true
3837

3938
- name: CodeFileSanity
4039
run: |
@@ -69,7 +68,6 @@ jobs:
6968
# - { prettyname: macOS, fullname: macos-latest }
7069
- { prettyname: Linux, fullname: ubuntu-latest }
7170
threadingMode: ['SingleThread', 'MultiThreaded']
72-
suite: ['Visual', 'NonVisual', 'Rulesets']
7371
timeout-minutes: 120
7472
steps:
7573
- name: Checkout
@@ -79,37 +77,32 @@ jobs:
7977
uses: actions/setup-dotnet@v4
8078
with:
8179
dotnet-version: "8.0.x"
82-
cache: false
8380

8481
- name: Compile
8582
run: dotnet build -c Debug -warnaserror osu.Desktop.slnf
8683

8784
- name: Test
88-
shell: bash
89-
run: |
90-
if [ "${{ matrix.suite }}" == "Visual" ]; then
91-
dotnet test osu.Game.Tests/bin/Debug/**/osu.Game.Tests.dll --logger "trx;LogFileName=TestResults-${{matrix.os.prettyname}}-${{matrix.threadingMode}}-${{matrix.suite}}.trx" -- NUnit.ConsoleOut=0 --filter "FullyQualifiedName~osu.Game.Tests.Visual"
92-
elif [ "${{ matrix.suite }}" == "NonVisual" ]; then
93-
dotnet test osu.Game.Tests/bin/Debug/**/osu.Game.Tests.dll --logger "trx;LogFileName=TestResults-${{matrix.os.prettyname}}-${{matrix.threadingMode}}-${{matrix.suite}}.trx" -- NUnit.ConsoleOut=0 --filter "FullyQualifiedName!~osu.Game.Tests.Visual"
94-
else
95-
dotnet test osu.Game.Rulesets.Osu.Tests/bin/Debug/**/osu.Game.Rulesets.Osu.Tests.dll \
96-
osu.Game.Rulesets.Taiko.Tests/bin/Debug/**/osu.Game.Rulesets.Taiko.Tests.dll \
97-
osu.Game.Rulesets.Catch.Tests/bin/Debug/**/osu.Game.Rulesets.Catch.Tests.dll \
98-
osu.Game.Rulesets.Mania.Tests/bin/Debug/**/osu.Game.Rulesets.Mania.Tests.dll \
99-
osu.Game.Tournament.Tests/bin/Debug/**/osu.Game.Tournament.Tests.dll \
100-
Templates/**/*.Tests/bin/Debug/**/*.Tests.dll \
101-
--logger "trx;LogFileName=TestResults-${{matrix.os.prettyname}}-${{matrix.threadingMode}}-${{matrix.suite}}.trx" \
102-
-- NUnit.ConsoleOut=0
103-
fi
85+
run: >
86+
dotnet test
87+
osu.Game.Tests/bin/Debug/**/osu.Game.Tests.dll
88+
osu.Game.Rulesets.Osu.Tests/bin/Debug/**/osu.Game.Rulesets.Osu.Tests.dll
89+
osu.Game.Rulesets.Taiko.Tests/bin/Debug/**/osu.Game.Rulesets.Taiko.Tests.dll
90+
osu.Game.Rulesets.Catch.Tests/bin/Debug/**/osu.Game.Rulesets.Catch.Tests.dll
91+
osu.Game.Rulesets.Mania.Tests/bin/Debug/**/osu.Game.Rulesets.Mania.Tests.dll
92+
osu.Game.Tournament.Tests/bin/Debug/**/osu.Game.Tournament.Tests.dll
93+
Templates/**/*.Tests/bin/Debug/**/*.Tests.dll
94+
--logger "trx;LogFileName=TestResults-${{matrix.os.prettyname}}-${{matrix.threadingMode}}.trx"
95+
--
96+
NUnit.ConsoleOut=0
10497
10598
# Attempt to upload results even if test fails.
10699
# https://docs.github.com/en/actions/reference/context-and-expression-syntax-for-github-actions#always
107100
- name: Upload Test Results
108101
uses: actions/upload-artifact@v4
109102
if: ${{ always() }}
110103
with:
111-
name: osu-test-results-${{matrix.os.prettyname}}-${{matrix.threadingMode}}-${{matrix.suite}}
112-
path: ${{github.workspace}}/TestResults/TestResults-${{matrix.os.prettyname}}-${{matrix.threadingMode}}-${{matrix.suite}}.trx
104+
name: osu-test-results-${{matrix.os.prettyname}}-${{matrix.threadingMode}}
105+
path: ${{github.workspace}}/TestResults/TestResults-${{matrix.os.prettyname}}-${{matrix.threadingMode}}.trx
113106

114107
build-only-android:
115108
name: Build only (Android)
@@ -129,18 +122,16 @@ jobs:
129122
uses: actions/setup-dotnet@v4
130123
with:
131124
dotnet-version: "8.0.x"
132-
cache: false
133125

134126
- name: Install .NET workloads
135-
run: dotnet workload install android wasi-experimental
127+
run: dotnet workload install android
136128

137129
- name: Compile
138130
run: dotnet build -c Debug osu.Android.slnf
139131

140132
build-only-ios:
141133
name: Build only (iOS)
142134
runs-on: macos-15
143-
continue-on-error: true
144135
timeout-minutes: 60
145136
steps:
146137
- name: Checkout
@@ -150,7 +141,6 @@ jobs:
150141
uses: actions/setup-dotnet@v4
151142
with:
152143
dotnet-version: "8.0.x"
153-
cache: false
154144

155145
- name: Install .NET Workloads
156146
run: dotnet workload install ios

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,4 +344,3 @@ FodyWeavers.xsd
344344

345345
.idea/.idea.osu.Desktop/.idea/misc.xml
346346
.idea/.idea.osu.Android/.idea/deploymentTargetDropDown.xml
347-
test_output.txt

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
"rollForward": "latestFeature",
55
"allowPrerelease": false
66
}
7-
}
7+
}

‎osu.Android.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<SupportedOSPlatformVersion>31.0</SupportedOSPlatformVersion>
3+
<SupportedOSPlatformVersion>21.0</SupportedOSPlatformVersion>
44
<RuntimeIdentifiers>android-x86;android-arm;android-arm64</RuntimeIdentifiers>
55
<AndroidPackageFormat>apk</AndroidPackageFormat>
66
<MandroidI18n>CJK;Mideast;Rare;West;Other;</MandroidI18n>
@@ -10,7 +10,7 @@
1010
<EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
1111
</PropertyGroup>
1212
<ItemGroup>
13-
<PackageReference Include="ppy.osu.Framework.Android" Version="2026.129.0" />
13+
<PackageReference Include="ppy.osu.Framework.Android" Version="2026.209.0" />
1414
</ItemGroup>
1515
<PropertyGroup>
1616
<!-- Fody does not handle Android build well, and warns when unchanged.

‎osu.Android/AndroidManifest.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="sh.ppy.osulazer" android:installLocation="auto">
3-
<uses-sdk android:minSdkVersion="31" android:targetSdkVersion="34" />
3+
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="34" />
44
<application android:allowBackup="true"
55
android:supportsRtl="true"
66
android:label="osu!"
77
android:icon="@mipmap/ic_launcher"
8-
android:roundIcon="@mipmap/ic_launcher"
9-
android:largeHeap="true" />
8+
android:roundIcon="@mipmap/ic_launcher" />
109
<!-- for editor usage -->
1110
<uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
1211
<uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />

0 commit comments

Comments
 (0)