From e8817399f6a0ea5f96a0a6b7a4bbdec87c764c41 Mon Sep 17 00:00:00 2001 From: Balazs Perlaki-Horvath Date: Sat, 1 Mar 2025 14:55:34 +0100 Subject: [PATCH 1/4] Try out Xcode 16.1 on CI/CD --- .github/actions/xcbuild/action.yml | 6 +++--- .github/workflows/cd.yml | 2 +- .github/workflows/ci.yml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/actions/xcbuild/action.yml b/.github/actions/xcbuild/action.yml index 04b345cd..c09222ae 100644 --- a/.github/actions/xcbuild/action.yml +++ b/.github/actions/xcbuild/action.yml @@ -53,10 +53,10 @@ runs: -T /usr/bin/security \ -T /usr/bin/productbuild || true - - name: Set Xcode version (15.4.0) + - name: Set Xcode version (16.1.0) shell: bash - # https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md#xcode - run: sudo xcode-select -s /Applications/Xcode_15.4.0.app + # https://github.com/actions/runner-images/blob/main/images/macos/macos-14-Readme.md#xcode + run: sudo xcode-select -s /Applications/Xcode_16.1.0.app - name: Create Keychain shell: bash diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index b091bccb..8e1c0e7b 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -122,7 +122,7 @@ jobs: - name: Set iOS extra xcode params if: matrix.platform == 'iOS' && contains(env.UPLOAD_TO, matrix.destination) - run: echo "EXTRA_XCODEBUILD=-sdk iphoneos ${{ env.APPLE_AUTH_PARAMS }}" >> $GITHUB_ENV + run: echo "EXTRA_XCODEBUILD=-sdk iphoneos18.1 ${{ env.APPLE_AUTH_PARAMS }}" >> $GITHUB_ENV - name: Set macOS extra xcode params if: matrix.platform == 'macOS' && contains(env.UPLOAD_TO, matrix.destination) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 06e2ff65..64bf5e08 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -41,7 +41,7 @@ jobs: - name: Set EXTRA_XCODEBUILD for iOS if: matrix.platform == 'iOS' - run: echo "EXTRA_XCODEBUILD=-sdk iphoneos ${{ env.APPLE_AUTH_PARAMS }}" >> $GITHUB_ENV + run: echo "EXTRA_XCODEBUILD=-sdk iphoneos18.1 ${{ env.APPLE_AUTH_PARAMS }}" >> $GITHUB_ENV - name: Set EXTRA_XCODEBUILD for macOS if: matrix.platform == 'macOS' From 220abb5e65c629b228fc857a581120dae5417229 Mon Sep 17 00:00:00 2001 From: Balazs Perlaki-Horvath Date: Sat, 1 Mar 2025 17:13:11 +0100 Subject: [PATCH 2/4] Change iOS simulator for tests --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 64bf5e08..647c09a8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -64,7 +64,7 @@ jobs: - name: Run Unit Tests on iOS if: matrix.platform == 'iOS' - run: xcodebuild test -scheme Kiwix -destination 'platform=iOS Simulator,name=iPhone 15 Plus' + run: xcodebuild test -scheme Kiwix -destination 'platform=iOS Simulator,name=iPhone 16 Pro' - name: Run Unit Tests on macOS if: matrix.platform == 'macOS' From dc3b6a75cc1a1619996925091fbd94411e7f91ac Mon Sep 17 00:00:00 2001 From: Balazs Perlaki-Horvath Date: Sat, 1 Mar 2025 17:30:05 +0100 Subject: [PATCH 3/4] Remove exact name for simulator --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 647c09a8..71ac3016 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -64,7 +64,7 @@ jobs: - name: Run Unit Tests on iOS if: matrix.platform == 'iOS' - run: xcodebuild test -scheme Kiwix -destination 'platform=iOS Simulator,name=iPhone 16 Pro' + run: xcodebuild test -scheme Kiwix -destination 'platform=iOS Simulator' - name: Run Unit Tests on macOS if: matrix.platform == 'macOS' From 63923b24796e2193941ca5a638af095dab8c63fd Mon Sep 17 00:00:00 2001 From: Balazs Perlaki-Horvath Date: Sat, 1 Mar 2025 19:25:30 +0100 Subject: [PATCH 4/4] Use iPhone 16 Pro for unit tests --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 71ac3016..647c09a8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -64,7 +64,7 @@ jobs: - name: Run Unit Tests on iOS if: matrix.platform == 'iOS' - run: xcodebuild test -scheme Kiwix -destination 'platform=iOS Simulator' + run: xcodebuild test -scheme Kiwix -destination 'platform=iOS Simulator,name=iPhone 16 Pro' - name: Run Unit Tests on macOS if: matrix.platform == 'macOS'