From f0b98798e5357a874af927328f8082ef9d661b7f Mon Sep 17 00:00:00 2001 From: "Zach Keeping [SSW]" <11418832+zacharykeeping@users.noreply.github.com> Date: Thu, 10 Oct 2024 12:47:18 +1100 Subject: [PATCH] =?UTF-8?q?=F0=9F=9B=A0=EF=B8=8F=20Fix=20iOS=20build=20in?= =?UTF-8?q?=20pipeline=20(#1075)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 --- .github/workflows/admin-build.yml | 9 ++++++++- .github/workflows/android-build.yml | 4 ++-- .github/workflows/api-build.yml | 9 +++++++-- .github/workflows/ci.yml | 13 ++++++++++--- .github/workflows/ios-build.yml | 10 +++++----- .github/workflows/ios-deploy.yml | 2 +- global.json | 5 +++-- 7 files changed, 36 insertions(+), 16 deletions(-) diff --git a/.github/workflows/admin-build.yml b/.github/workflows/admin-build.yml index 0d1b09ebd..da1d6b009 100644 --- a/.github/workflows/admin-build.yml +++ b/.github/workflows/admin-build.yml @@ -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 diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml index f2f5a3a32..9d519de0e 100644 --- a/.github/workflows/android-build.yml +++ b/.github/workflows/android-build.yml @@ -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: | diff --git a/.github/workflows/api-build.yml b/.github/workflows/api-build.yml index cc4761f36..47d26a9ca 100644 --- a/.github/workflows/api-build.yml +++ b/.github/workflows/api-build.yml @@ -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 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bf9e6416b..56867080c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 }} @@ -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: | diff --git a/.github/workflows/ios-build.yml b/.github/workflows/ios-build.yml index 8d9c989f0..4b036758a 100644 --- a/.github/workflows/ios-build.yml +++ b/.github/workflows/ios-build.yml @@ -12,7 +12,7 @@ on: jobs: build: - runs-on: macos-13 + runs-on: macos-14 environment: ${{ inputs.environment }} name: iOS Build @@ -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: | @@ -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 diff --git a/.github/workflows/ios-deploy.yml b/.github/workflows/ios-deploy.yml index 4303d0af7..65ffba4c9 100644 --- a/.github/workflows/ios-deploy.yml +++ b/.github/workflows/ios-deploy.yml @@ -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 diff --git a/global.json b/global.json index c19a2e057..c16a0a2c1 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,7 @@ { "sdk": { - "version": "8.0.100", - "rollForward": "latestMinor" + "version": "8.0.402", + "workloadVersion": "8.0.402", + "rollForward": "disable" } }