diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a3f744d8..cffa9da6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,14 +13,29 @@ jobs: uses: actions/checkout@v1 - name: Validate Package - run: swift build --sdk "`xcrun --sdk iphonesimulator --show-sdk-path`" --triple arm64-apple-ios13.0-simulator - build_macos15: - runs-on: macos-15 + run: swift build --sdk "`xcrun --sdk iphonesimulator --show-sdk-path`" --triple arm64-apple-ios18.0-simulator + build: + runs-on: ${{ matrix.os }} strategy: matrix: - run-config: - - { xcode_version: '16.4', simulator: 'name=iPad (10th generation),OS=18.5,arch=arm64', run_extra_validations: 'false' } - - { xcode_version: '16.4', simulator: 'name=iPhone 16,OS=18.5,arch=arm64', run_extra_validations: 'true' } + include: + - xcode_version: '16.4' + os: 'macos-15' + sim_device: 'iPad (10th generation)' + run_extra_validations: 'false' + ios_version: '18.5' + + - xcode_version: '16.4' + os: 'macos-15' + sim_device: 'iPhone 16' + run_extra_validations: 'true' + ios_version: '18.5' + + - xcode_version: '26.6' + os: 'macos-26' + sim_device: 'iPhone 17 Pro' + run_extra_validations: 'false' + ios_version: '26.5' steps: - name: Checkout Project uses: actions/checkout@v1 @@ -28,26 +43,25 @@ jobs: - name: Brew Update run: brew update - - name: Install Bundler - run: gem install bundler - - name: Install Core Utils run: if [ -z "$(brew ls --versions coreutils)" ] ; then brew install coreutils ; fi - - name: Install XCPretty - run: gem install xcpretty --no-document --quiet - - name: Show Xcode versions run: ls -al /Applications/Xcode* - name: Select Xcode - run: sudo xcode-select -s /Applications/Xcode_${{ matrix.run-config['xcode_version'] }}.app + run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode_version }}.app - name: Current Xcode Selected run: xcode-select -p + # - name: Create Simulator + # run: | + # xcrun simctl list runtimes + # xcrun simctl create "${{ matrix.sim_device }}" "${{ matrix.sim_device }}" "iOS ${{ matrix.ios_version }}" + - name: List Simulators run: xcrun simctl list - name: Build & Test - run: ./scripts/ci.sh "${{ matrix.run-config['simulator'] }}" "${{ matrix.run-config['run_extra_validations'] }}" + run: ./scripts/ci.sh "name=${{ matrix.sim_device }},OS=${{ matrix.ios_version }},arch=arm64" "${{ matrix.run_extra_validations }}" diff --git a/Tests/KIFTests/LandscapeTests.m b/Tests/KIFTests/LandscapeTests.m index 5b359f95..93a10088 100644 --- a/Tests/KIFTests/LandscapeTests.m +++ b/Tests/KIFTests/LandscapeTests.m @@ -32,7 +32,7 @@ - (void)afterAll - (void)testThatAlertViewsCanBeTappedInLandscape { // The tap can fail if the initial scroll is still happening scroll - [tester waitForTimeInterval:0.5]; + [tester waitForTimeInterval:1.0]; [tester tapViewWithAccessibilityLabel:@"UIAlertController"]; if (UIDevice.currentDevice.userInterfaceIdiom == UIUserInterfaceIdiomPhone) { [tester tapViewWithAccessibilityLabel:@"Cancel"];