1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-21 18:07:23 +08:00

Revert Xamarin regression workaround in Android CI build definition

This commit is a revert of 53e52d2c4b.
Partially done because the workaround is no longer needed, partially
because macOS images have begun to fail after a new image rollout with
bumped NuGet versions.
This commit is contained in:
Bartłomiej Dach 2022-06-16 20:45:55 +02:00
parent 73ec43338a
commit 9141a7a907
No known key found for this signature in database
GPG Key ID: BCECCD4FA41F6497

View File

@ -96,27 +96,20 @@ jobs:
build-only-android: build-only-android:
name: Build only (Android) name: Build only (Android)
runs-on: macos-latest runs-on: windows-latest
timeout-minutes: 60 timeout-minutes: 60
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v2 uses: actions/checkout@v2
# Pin Xamarin.Android version to 11.2 for now to avoid build failures caused by a Xamarin-side regression.
# See: https://github.com/xamarin/xamarin-android/issues/6284
# This can be removed/reverted when the fix makes it to upstream and is deployed on github runners.
- name: Set default Xamarin SDK version
run: |
$VM_ASSETS/select-xamarin-sdk-v2.sh --mono=6.12 --android=11.2
- name: Install .NET 6.0.x - name: Install .NET 6.0.x
uses: actions/setup-dotnet@v1 uses: actions/setup-dotnet@v1
with: with:
dotnet-version: "6.0.x" dotnet-version: "6.0.x"
# Contrary to seemingly any other msbuild, msbuild running on macOS/Mono - name: Setup MSBuild
# cannot accept .sln(f) files as arguments. uses: microsoft/setup-msbuild@v1
# Build just the main game for now.
- name: Build - name: Build
run: msbuild osu.Android/osu.Android.csproj /restore /p:Configuration=Debug run: msbuild osu.Android/osu.Android.csproj /restore /p:Configuration=Debug