diff --git a/.github/workflows/cron-checks.yml b/.github/workflows/cron-checks.yml index 6b31ef0..eeaac6f 100644 --- a/.github/workflows/cron-checks.yml +++ b/.github/workflows/cron-checks.yml @@ -21,7 +21,7 @@ jobs: strategy: matrix: include: - - ios: "26.0" + - ios: "26.1" device: "iPhone 17 Pro" setup_runtime: false - ios: "18.5" @@ -39,7 +39,8 @@ jobs: fail-fast: false runs-on: macos-15 env: - XCODE_VERSION: "26.0.1" + XCODE_VERSION: "26.1.1" + IOS_SIMULATOR_DEVICE: "${{ matrix.device }} (${{ matrix.ios }})" steps: - uses: actions/checkout@v4.1.1 - uses: ./.github/actions/bootstrap @@ -53,7 +54,7 @@ jobs: version: ${{ matrix.ios }} device: ${{ matrix.device }} - name: Run LLC Tests (Debug) - run: bundle exec fastlane test device:"${{ matrix.device }} (${{ matrix.ios }})" cron:true + run: bundle exec fastlane test device:"${{ env.IOS_SIMULATOR_DEVICE }}" cron:true timeout-minutes: 60 - name: Parse xcresult if: failure() @@ -73,7 +74,7 @@ jobs: strategy: matrix: include: - - xcode: 26.0.1 # swift 6.2 + - xcode: 26.1.1 # swift 6.2 os: macos-15 - xcode: 16.4 # swift 6.1 os: macos-15 diff --git a/.github/workflows/smoke-checks.yml b/.github/workflows/smoke-checks.yml index 5a3016e..a5de805 100644 --- a/.github/workflows/smoke-checks.yml +++ b/.github/workflows/smoke-checks.yml @@ -20,7 +20,7 @@ concurrency: env: HOMEBREW_NO_INSTALL_CLEANUP: 1 # Disable cleanup for homebrew, we don't need it on CI - IOS_SIMULATOR_DEVICE: "iPhone 17 Pro (26.0)" + IOS_SIMULATOR_DEVICE: "iPhone 17 Pro (26.1)" GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_PR_NUM: ${{ github.event.pull_request.number }} @@ -94,7 +94,7 @@ jobs: - uses: ./.github/actions/ruby-cache - uses: ./.github/actions/xcode-cache - name: Build Demo App - run: bundle exec fastlane build_demo + run: bundle exec fastlane build_demo device:"${{ env.IOS_SIMULATOR_DEVICE }}" build-spm-integration: name: Build SPM Integration App diff --git a/Scripts/bootstrap.sh b/Scripts/bootstrap.sh index 175b324..c74679e 100755 --- a/Scripts/bootstrap.sh +++ b/Scripts/bootstrap.sh @@ -30,7 +30,7 @@ if [ "${SKIP_SWIFT_BOOTSTRAP:-}" != true ]; then puts "Install SwiftLint v${SWIFT_LINT_VERSION}" DOWNLOAD_URL="https://github.com/realm/SwiftLint/releases/download/${SWIFT_LINT_VERSION}/SwiftLint.pkg" DOWNLOAD_PATH="/tmp/SwiftLint-${SWIFT_LINT_VERSION}.pkg" - curl -sL "$DOWNLOAD_URL" -o "$DOWNLOAD_PATH" + wget "$DOWNLOAD_URL" -O "$DOWNLOAD_PATH" sudo installer -pkg "$DOWNLOAD_PATH" -target / swiftlint version @@ -39,7 +39,7 @@ if [ "${SKIP_SWIFT_BOOTSTRAP:-}" != true ]; then DOWNLOAD_PATH="/tmp/swiftformat-${SWIFT_FORMAT_VERSION}.zip" BIN_PATH="/usr/local/bin/swiftformat" brew uninstall swiftformat || true - curl -sL "$DOWNLOAD_URL" -o "$DOWNLOAD_PATH" + wget "$DOWNLOAD_URL" -O "$DOWNLOAD_PATH" unzip -o "$DOWNLOAD_PATH" -d /tmp/swiftformat-${SWIFT_FORMAT_VERSION} sudo mv /tmp/swiftformat-${SWIFT_FORMAT_VERSION}/swiftformat "$BIN_PATH" sudo chmod +x "$BIN_PATH" @@ -50,7 +50,7 @@ if [ "${SKIP_SWIFT_BOOTSTRAP:-}" != true ]; then DOWNLOAD_PATH="/tmp/swiftgen-${SWIFT_GEN_VERSION}.zip" INSTALL_DIR="/usr/local/lib/swiftgen" BIN_PATH="/usr/local/bin/swiftgen" - curl -sL "$DOWNLOAD_URL" -o "$DOWNLOAD_PATH" + wget "$DOWNLOAD_URL" -O "$DOWNLOAD_PATH" sudo rm -rf "$INSTALL_DIR" sudo mkdir -p "$INSTALL_DIR" sudo unzip -o "$DOWNLOAD_PATH" -d "$INSTALL_DIR" @@ -62,7 +62,7 @@ fi if [[ ${INSTALL_SONAR-default} == true ]]; then puts "Install sonar scanner v${SONAR_VERSION}" DOWNLOAD_URL="https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${SONAR_VERSION}-macosx-x64.zip" - curl -sL "${DOWNLOAD_URL}" -o ./fastlane/sonar.zip + wget "${DOWNLOAD_URL}" -O ./fastlane/sonar.zip cd fastlane unzip sonar.zip rm sonar.zip @@ -74,12 +74,12 @@ fi if [[ ${INSTALL_ALLURE-default} == true ]]; then puts "Install allurectl v${ALLURECTL_VERSION}" DOWNLOAD_URL="https://github.com/allure-framework/allurectl/releases/download/${ALLURECTL_VERSION}/allurectl_darwin_amd64" - curl -sL "${DOWNLOAD_URL}" -o ./fastlane/allurectl + wget "${DOWNLOAD_URL}" -O ./fastlane/allurectl chmod +x ./fastlane/allurectl puts "Install xcresults v${XCRESULTS_VERSION}" DOWNLOAD_URL="https://github.com/eroshenkoam/xcresults/releases/download/${XCRESULTS_VERSION}/xcresults" - curl -sL "${DOWNLOAD_URL}" -o ./fastlane/xcresults + wget "${DOWNLOAD_URL}" -O ./fastlane/xcresults chmod +x ./fastlane/xcresults fi diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 844ce3d..2c60fdc 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -6,7 +6,7 @@ require 'json' require 'net/http' import 'Sonarfile' -xcode_version = ENV['XCODE_VERSION'] || '26.0.1' +xcode_version = ENV['XCODE_VERSION'] || '26.1.1' xcode_project = 'StreamFeeds.xcodeproj' sdk_names = ['StreamFeeds'] github_repo = ENV['GITHUB_REPOSITORY'] || 'GetStream/stream-feeds-swift'