Skip to content

Commit 126617d

Browse files
authored
Merge pull request #18 from janusw/gha_mac
Fix GHA build errors on Mac
2 parents ad98df7 + 71fe3ac commit 126617d

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

.github/workflows/dotnet.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
path: ./Source/*/nuget/*.nupkg
4444

4545
macBuild:
46-
runs-on: macos-14
46+
runs-on: macos-15
4747
steps:
4848
- uses: actions/checkout@v4
4949
with:
@@ -55,12 +55,14 @@ jobs:
5555
- name: Setup XCode
5656
uses: maxim-lobanov/setup-xcode@v1
5757
with:
58-
xcode-version: '15'
58+
xcode-version: latest-stable
5959
- name: Install .NET MAUI
6060
run: |
6161
dotnet nuget locals all --clear
6262
dotnet workload install maui --source https://aka.ms/dotnet6/nuget/index.json --source https://api.nuget.org/v3/index.json
6363
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
64+
- name: Install Android tools
65+
run: ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_SDK_ROOT "platforms;android-34" "build-tools;34.0.0" "platform-tools"
6466
- name: Build library (with nuget package)
6567
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
6668
- name: Build sample
@@ -79,9 +81,7 @@ jobs:
7981
- name: Install workloads
8082
run: dotnet workload install android wasm-tools maui-android
8183
- name: Install Android tools
82-
run: |
83-
${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager \
84-
--sdk_root=$ANDROID_SDK_ROOT "platform-tools"
84+
run: ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_SDK_ROOT "platform-tools"
8585
- name: Build library (with nuget package)
8686
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
8787
- name: Build sample

0 commit comments

Comments
 (0)