Skip to content

Commit

Permalink
🛠️ Fix iOS build in pipeline (#1075)
Browse files Browse the repository at this point in the history
* Pin to 8.0.402.0 and macos-14

* Update workload version

* update rollForward

* Try 8.0.403

* Test iOS build

* Update xcode version

* Remove build

* Update sdk version

* Move to actions/setup-dotnet@v4 with global.json

* Update workload ver
  • Loading branch information
zacharykeeping authored Oct 10, 2024
1 parent 1eac8e4 commit f0b9879
Show file tree
Hide file tree
Showing 7 changed files with 36 additions and 16 deletions.
9 changes: 8 additions & 1 deletion .github/workflows/admin-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,14 @@ jobs:
- uses: actions/checkout@v2

- name: Setup .NET
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
global-json-file: global.json

- name: Install Workload
run: |
dotnet nuget locals all --clear
dotnet workload install wasm-tools --source https://api.nuget.org/v3/index.json --ignore-failed-sources
- name: Restore
shell: bash
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/android-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ jobs:
echo ${{ vars.GOOGLE_SERVICES_JSON }} | base64 --decode > src/MobileUI/Platforms/Android/google-services.json
- name: Setup DotNet Environment
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: "8.0.x"
global-json-file: global.json

- name: Install MAUI Workload
run: |
Expand Down
9 changes: 7 additions & 2 deletions .github/workflows/api-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,14 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Setup .NET Core SDK
uses: actions/setup-dotnet@v2
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.x'
global-json-file: global.json

- name: Install Workload
run: |
dotnet nuget locals all --clear
dotnet workload install wasm-tools --source https://api.nuget.org/v3/index.json --ignore-failed-sources
- name: Install dependencies
run: dotnet restore $PROJECT
Expand Down
13 changes: 10 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,14 @@ jobs:
- uses: actions/checkout@v2

- name: Setup .NET
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
global-json-file: global.json

- name: Install Workload
run: |
dotnet nuget locals all --clear
dotnet workload install wasm-tools --source https://api.nuget.org/v3/index.json --ignore-failed-sources
- name: Restore
run: dotnet restore ${{ inputs.project_path }}
Expand Down Expand Up @@ -65,9 +72,9 @@ jobs:
- uses: actions/checkout@v3

- name: Setup DotNet Environment
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: "8.0.x"
global-json-file: global.json

- name: Install MAUI Workload
run: |
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/ios-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:

jobs:
build:
runs-on: macos-13
runs-on: macos-14
environment: ${{ inputs.environment }}
name: iOS Build

Expand All @@ -28,9 +28,9 @@ jobs:
echo ${{ vars.GOOGLESERVICE_INFO_PLIST }} | base64 --decode > src/MobileUI/Platforms/iOS/GoogleService-Info.plist
- name: Setup DotNet Environment
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: "8.0.x"
global-json-file: global.json

- name: Install MAUI Workload
run: |
Expand All @@ -42,8 +42,8 @@ jobs:
if: runner.os == 'macOS'
shell: bash
run: |
sudo xcode-select -s "/Applications/Xcode_15.1.app"
echo "MD_APPLE_SDK_ROOT=/Applications/Xcode_15.1.app" >> $GITHUB_ENV
sudo xcode-select -s "/Applications/Xcode_15.4.app"
echo "MD_APPLE_SDK_ROOT=/Applications/Xcode_15.4.app" >> $GITHUB_ENV
- name: Import Code-Signing Certificates
uses: Apple-Actions/import-codesign-certs@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ios-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
jobs:
deploy-ios:
name: Deploy iOS to TestFlight
runs-on: macos-13
runs-on: macos-14
environment: ${{ inputs.environment }}
steps:
- name: Download artifact
Expand Down
5 changes: 3 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"sdk": {
"version": "8.0.100",
"rollForward": "latestMinor"
"version": "8.0.402",
"workloadVersion": "8.0.402",
"rollForward": "disable"
}
}

0 comments on commit f0b9879

Please sign in to comment.