mirror of
https://github.com/ppy/osu.git
synced 2024-11-11 10:33:30 +08:00
Merge pull request #18739 from bdach/unpin-xamarin-on-ci
Revert Xamarin regression workaround in Android CI build definition
This commit is contained in:
commit
c9a02aafd8
15
.github/workflows/ci.yml
vendored
15
.github/workflows/ci.yml
vendored
@ -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
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user