From 3b13ffed2ecebfb91710d43eae96ea3bfe3cf0ed Mon Sep 17 00:00:00 2001 From: Janus Weil Date: Sun, 6 Oct 2024 12:43:01 +0200 Subject: [PATCH 1/2] GHA: update to MacOS 15 and XCode 16 --- .github/workflows/dotnet.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 05be993..f105ecc 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -43,7 +43,7 @@ jobs: path: ./Source/*/nuget/*.nupkg macBuild: - runs-on: macos-14 + runs-on: macos-15 steps: - uses: actions/checkout@v4 with: @@ -55,7 +55,7 @@ jobs: - name: Setup XCode uses: maxim-lobanov/setup-xcode@v1 with: - xcode-version: '15' + xcode-version: latest-stable - name: Install .NET MAUI run: | dotnet nuget locals all --clear From 71fe3acbf26ab72c41bf785bcef3da63c760c974 Mon Sep 17 00:00:00 2001 From: Janus Weil Date: Sun, 6 Oct 2024 14:25:55 +0200 Subject: [PATCH 2/2] GHA: install Android tools on Mac --- .github/workflows/dotnet.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index f105ecc..f636007 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -61,6 +61,8 @@ jobs: dotnet nuget locals all --clear dotnet workload install maui --source https://aka.ms/dotnet6/nuget/index.json --source https://api.nuget.org/v3/index.json dotnet workload install android ios maccatalyst tvos macos maui wasm-tools maui-maccatalyst --source https://aka.ms/dotnet6/nuget/index.json --source https://api.nuget.org/v3/index.json + - name: Install Android tools + run: ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_SDK_ROOT "platforms;android-34" "build-tools;34.0.0" "platform-tools" - name: Build library (with nuget package) run: dotnet build ./Source/OxyPlot.Maui.Skia/OxyPlot.Maui.Skia.csproj /p:Configuration=Release /t:restore,build,pack /p:Version=$(git describe) /p:ContinuousIntegrationBuild=true /p:DeterministicSourcePaths=false - name: Build sample @@ -79,9 +81,7 @@ jobs: - name: Install workloads run: dotnet workload install android wasm-tools maui-android - name: Install Android tools - run: | - ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager \ - --sdk_root=$ANDROID_SDK_ROOT "platform-tools" + run: ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_SDK_ROOT "platform-tools" - name: Build library (with nuget package) run: dotnet build ./Source/OxyPlot.Maui.Skia/OxyPlot.Maui.Skia.csproj /p:Configuration=Release /t:restore,build,pack /p:Version=$(git describe) /p:ContinuousIntegrationBuild=true /p:DeterministicSourcePaths=false - name: Build sample