From b4e98d8709bce9a20ba939814d35335024ea982d Mon Sep 17 00:00:00 2001 From: Clare So <1740517+clarmso@users.noreply.github.com> Date: Wed, 25 Mar 2026 14:56:15 -0400 Subject: [PATCH 1/5] Bump bitrise to xcode 26.4 release stack --- bitrise.yml | 76 ++++++++++++++++++++++++++--------------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/bitrise.yml b/bitrise.yml index 1047002d44fd8..23035275f77df 100644 --- a/bitrise.yml +++ b/bitrise.yml @@ -74,7 +74,7 @@ workflows: mkdir DerivedData xcodebuild -resolvePackageDependencies -onlyUsePackageVersionsFromResolvedFile - xcodebuild "-project" "/Users/vagrant/git/firefox-ios/Client.xcodeproj" "-scheme" "Fennec" -configuration "Fennec_Testing" "CODE_SIGNING_ALLOWED=NO" -sdk "iphonesimulator" "-destination" "platform=iOS Simulator,name=iPhone 17,OS=26.2" "COMPILER_INDEX_STORE_ENABLE=NO" "build-for-testing" "CODE_SIGN_IDENTITY=" "CODE_SIGNING_REQUIRED=NO" "CODE_SIGNING_ALLOWED=NO" -derivedDataPath "/Users/vagrant/git/DerivedData" | xcpretty | tee xcodebuild_fennec.log + xcodebuild "-project" "/Users/vagrant/git/firefox-ios/Client.xcodeproj" "-scheme" "Fennec" -configuration "Fennec_Testing" "CODE_SIGNING_ALLOWED=NO" -sdk "iphonesimulator" "-destination" "platform=iOS Simulator,name=iPhone 17,OS=26.4" "COMPILER_INDEX_STORE_ENABLE=NO" "build-for-testing" "CODE_SIGN_IDENTITY=" "CODE_SIGNING_REQUIRED=NO" "CODE_SIGNING_ALLOWED=NO" -derivedDataPath "/Users/vagrant/git/DerivedData" | xcpretty | tee xcodebuild_fennec.log ls /Users/vagrant/git/DerivedData/Build/Products ls /Users/vagrant/git/DerivedData @@ -83,9 +83,9 @@ workflows: continue_on_fail: true timeout: 1200 inputs: - - destination: platform=iOS Simulator,name=iPhone 17,OS=26.2 + - destination: platform=iOS Simulator,name=iPhone 17,OS=26.4 - xcodebuild_options: '"COMPILER_INDEX_STORE_ENABLE=NO" "CODE_SIGN_IDENTITY=" "CODE_SIGNING_REQUIRED=NO" "CODE_SIGNING_ALLOWED=NO"' - - xctestrun: "/Users/vagrant/git/DerivedData/Build/Products/Fennec_AccessibilityTestPlan_iphonesimulator26.2-arm64.xctestrun" + - xctestrun: "/Users/vagrant/git/DerivedData/Build/Products/Fennec_AccessibilityTestPlan_iphonesimulator26.4-arm64.xctestrun" - maximum_test_repetitions: 2 - script@1.2.1: @@ -161,7 +161,7 @@ workflows: - configuration: Fennec_Testing - project_path: /Users/vagrant/git/firefox-ios/Client.xcodeproj - xcodebuild_options: '"COMPILER_INDEX_STORE_ENABLE=NO" -allowProvisioningUpdates DEVELOPMENT_TEAM=$APPLE_TEAM_ID' - - destination: platform=iOS Simulator,name=iPhone 17,OS=26.2 + - destination: platform=iOS Simulator,name=iPhone 17,OS=26.4 - script@1.2.1: title: Detect number of warnings is_always_run: true @@ -197,8 +197,8 @@ workflows: set -euxo pipefail # Point to the Unit tests plan instead of Accessibility - UNIT_TESTS_XCTESTRUN="$BITRISE_TEST_BUNDLE_PATH/Fennec_UnitTest_iphonesimulator26.2-arm64.xctestrun" - SMOKE_UI_XCTESTRUN="$BITRISE_TEST_BUNDLE_PATH/Fennec_Smoketest_iphonesimulator26.2-arm64.xctestrun" + UNIT_TESTS_XCTESTRUN="$BITRISE_TEST_BUNDLE_PATH/Fennec_UnitTest_iphonesimulator26.4-arm64.xctestrun" + SMOKE_UI_XCTESTRUN="$BITRISE_TEST_BUNDLE_PATH/Fennec_Smoketest_iphonesimulator26.4-arm64.xctestrun" if [ ! -f "$UNIT_TESTS_XCTESTRUN" ]; then echo "ERROR: .xctestrun file not found: $UNIT_TESTS_XCTESTRUN" @@ -212,9 +212,9 @@ workflows: - xcode-test-without-building@0.5.1: timeout: 1200 inputs: - - destination: platform=iOS Simulator,name=iPhone 17,OS=26.2 + - destination: platform=iOS Simulator,name=iPhone 17,OS=26.4 - xcodebuild_options: '"COMPILER_INDEX_STORE_ENABLE=NO" "CODE_SIGN_IDENTITY=" "CODE_SIGNING_REQUIRED=NO" "CODE_SIGNING_ALLOWED=NO"' - - xctestrun: $BITRISE_TEST_BUNDLE_PATH/Fennec_UnitTest_iphonesimulator26.2-arm64.xctestrun + - xctestrun: $BITRISE_TEST_BUNDLE_PATH/Fennec_UnitTest_iphonesimulator26.4-arm64.xctestrun - maximum_test_repetitions: 2 - xcode-test-shard-calculation@0: run_if: '{{enveq "BITRISE_TEST_BUNDLE_PATH" "" | not}}' @@ -326,9 +326,9 @@ workflows: timeout: 1200 inputs: - only_testing: $BITRISE_TEST_SHARDS_PATH_FIREFOX/$BITRISE_IO_PARALLEL_INDEX - - destination: platform=iOS Simulator,name=iPhone 17,OS=26.2 + - destination: platform=iOS Simulator,name=iPhone 17,OS=26.4 - xcodebuild_options: '"COMPILER_INDEX_STORE_ENABLE=NO"' - - xctestrun: $BITRISE_TEST_BUNDLE_PATH/Fennec_Smoketest_iphonesimulator26.2-arm64.xctestrun + - xctestrun: $BITRISE_TEST_BUNDLE_PATH/Fennec_Smoketest_iphonesimulator26.4-arm64.xctestrun - deploy-to-bitrise-io@2.10.0: {} firefox_scheme_build_for_test: description: Build Firefox scheme and shard XCUITests for parallel execution @@ -353,7 +353,7 @@ workflows: - configuration: Firefox - project_path: /Users/vagrant/git/firefox-ios/Client.xcodeproj - xcodebuild_options: '"COMPILER_INDEX_STORE_ENABLE=NO" -allowProvisioningUpdates DEVELOPMENT_TEAM=$APPLE_TEAM_ID EXCLUDED_SOURCE_FILE_NAMES=""' - - destination: platform=iOS Simulator,name=iPhone 17,OS=26.2 + - destination: platform=iOS Simulator,name=iPhone 17,OS=26.4 - script@1.2.1: title: Find Smoketest xctestrun file inputs: @@ -401,9 +401,9 @@ workflows: - xcode-test-without-building@0.5.1: inputs: - only_testing: $BITRISE_TEST_SHARDS_PATH_FIREFOX_SCHEME/$BITRISE_IO_PARALLEL_INDEX - - destination: platform=iOS Simulator,name=iPhone 17,OS=26.2 + - destination: platform=iOS Simulator,name=iPhone 17,OS=26.4 - xcodebuild_options: '"COMPILER_INDEX_STORE_ENABLE=NO"' - - xctestrun: $BITRISE_TEST_BUNDLE_PATH/Firefox_Smoketest_iphonesimulator26.2-arm64-x86_64.xctestrun + - xctestrun: $BITRISE_TEST_BUNDLE_PATH/Firefox_Smoketest_iphonesimulator26.4-arm64-x86_64.xctestrun - deploy-to-bitrise-io@2.10.0: {} firefox_scheme_smoke_tests: description: Run XCUITests on Firefox scheme (non-parallelized, for standalone use) @@ -413,7 +413,7 @@ workflows: - pull-intermediate-files@1: {} - xcode-test-without-building@0.5.1: inputs: - - destination: platform=iOS Simulator,name=iPhone 17,OS=26.2 + - destination: platform=iOS Simulator,name=iPhone 17,OS=26.4 - xcodebuild_options: '"COMPILER_INDEX_STORE_ENABLE=NO" "CODE_SIGN_IDENTITY=" "CODE_SIGNING_REQUIRED=NO" "CODE_SIGNING_ALLOWED=NO"' - xctestrun: $BITRISE_XCTESTRUN_SMOKE_TEST_FILE_PATH - maximum_test_repetitions: 2 @@ -447,7 +447,7 @@ workflows: - configuration: FirefoxBeta - project_path: /Users/vagrant/git/firefox-ios/Client.xcodeproj - xcodebuild_options: '"COMPILER_INDEX_STORE_ENABLE=NO" -allowProvisioningUpdates DEVELOPMENT_TEAM=$APPLE_TEAM_ID EXCLUDED_SOURCE_FILE_NAMES=""' - - destination: platform=iOS Simulator,name=iPhone 17,OS=26.2 + - destination: platform=iOS Simulator,name=iPhone 17,OS=26.4 - script@1.2.1: title: Find Smoketest xctestrun file inputs: @@ -495,9 +495,9 @@ workflows: - xcode-test-without-building@0.5.1: inputs: - only_testing: $BITRISE_TEST_SHARDS_PATH_FIREFOX_BETA_SCHEME/$BITRISE_IO_PARALLEL_INDEX - - destination: platform=iOS Simulator,name=iPhone 17,OS=26.2 + - destination: platform=iOS Simulator,name=iPhone 17,OS=26.4 - xcodebuild_options: '"COMPILER_INDEX_STORE_ENABLE=NO"' - - xctestrun: $BITRISE_TEST_BUNDLE_PATH/FirefoxBeta_Smoketest_iphonesimulator26.2-arm64-x86_64.xctestrun + - xctestrun: $BITRISE_TEST_BUNDLE_PATH/FirefoxBeta_Smoketest_iphonesimulator26.4-arm64-x86_64.xctestrun - deploy-to-bitrise-io@2.10.0: {} firefox_beta_scheme_smoke_tests: description: Run XCUITests on FirefoxBeta scheme (non-parallelized, for standalone use) @@ -507,7 +507,7 @@ workflows: - pull-intermediate-files@1: {} - xcode-test-without-building@0.5.1: inputs: - - destination: platform=iOS Simulator,name=iPhone 17,OS=26.2 + - destination: platform=iOS Simulator,name=iPhone 17,OS=26.4 - xcodebuild_options: '"COMPILER_INDEX_STORE_ENABLE=NO" "CODE_SIGN_IDENTITY=" "CODE_SIGNING_REQUIRED=NO" "CODE_SIGNING_ALLOWED=NO"' - xctestrun: $BITRISE_XCTESTRUN_SMOKE_TEST_FILE_PATH - maximum_test_repetitions: 2 @@ -959,7 +959,7 @@ workflows: run_if: '{{getenv "NEW_XCODE_VERSION" | eq "New_Version_Found" | or (getenv "RUN_ALL_STEPS" | eq "Run_All_Steps")}}' inputs: - scheme: Fennec - - destination: platform=iOS Simulator,name=iPhone 17,OS=26.2 + - destination: platform=iOS Simulator,name=iPhone 17,OS=26.4 - deploy-to-bitrise-io@2.10.0: {} - slack@4.2.1: run_if: '{{getenv "NEW_XCODE_VERSION" | eq "New_Version_Found" | or (getenv "RUN_ALL_STEPS" | eq "Run_All_Steps")}}' @@ -971,7 +971,7 @@ workflows: description: This Workflow is to build the app using latest xcode available in Bitrise meta: bitrise.io: - stack: osx-xcode-26.4.x-edge + stack: osx-xcode-26.4.x machine_type_id: g2.mac.4large L10nBuild: steps: @@ -1583,7 +1583,7 @@ workflows: inputs: - project_path: firefox-ios/Client.xcodeproj - scheme: Fennec - - destination: platform=iOS Simulator,name=iPhone 17,OS=26.2 + - destination: platform=iOS Simulator,name=iPhone 17,OS=26.4 - test_plan: PerformanceTestPlan - script@1.2.1: is_always_run: true @@ -1959,24 +1959,24 @@ workflows: - configuration: Fennec_Testing - project_path: /Users/vagrant/git/firefox-ios/Client.xcodeproj - xcodebuild_options: '"COMPILER_INDEX_STORE_ENABLE=NO" -allowProvisioningUpdates DEVELOPMENT_TEAM=$APPLE_TEAM_ID' - - destination: platform=iOS Simulator,name=iPhone 17,OS=26.2 + - destination: platform=iOS Simulator,name=iPhone 17,OS=26.4 - script@1.2.1: title: "Create .xctestrun files for all iOS versions" inputs: - content: |- - SOURCE_FILE="$BITRISE_TEST_BUNDLE_PATH/Fennec_UnitTest_iphonesimulator26.2-arm64.xctestrun" + SOURCE_FILE="$BITRISE_TEST_BUNDLE_PATH/Fennec_UnitTest_iphonesimulator26.4-arm64.xctestrun" cp "$SOURCE_FILE" "$BITRISE_TEST_BUNDLE_PATH/Fennec_UnitTest_iphonesimulator18.6-arm64.xctestrun" cp "$SOURCE_FILE" "$BITRISE_TEST_BUNDLE_PATH/Fennec_UnitTest_iphonesimulator17.5-arm64.xctestrun" - xcode-test-without-building@0.5.1: - title: "Unit Tests - iPhone 17 (iOS 26.2)" + title: "Unit Tests - iPhone 17 (iOS 26.4)" timeout: 6000 is_always_run: true inputs: - project_path: firefox-ios/Client.xcodeproj - scheme: Fennec - configuration: Fennec_Testing - - destination: platform=iOS Simulator,name=iPhone 17,OS=26.2 - - xctestrun: $BITRISE_TEST_BUNDLE_PATH/Fennec_UnitTest_iphonesimulator26.2-arm64.xctestrun + - destination: platform=iOS Simulator,name=iPhone 17,OS=26.4 + - xctestrun: $BITRISE_TEST_BUNDLE_PATH/Fennec_UnitTest_iphonesimulator26.4-arm64.xctestrun - xcodebuild_options: '"COMPILER_INDEX_STORE_ENABLE=NO" "CODE_SIGN_IDENTITY=" "CODE_SIGNING_REQUIRED=NO" "CODE_SIGNING_ALLOWED=NO"' - xcode-test-without-building@0.5.1: title: "Unit Tests - iPhone 16 (iOS 18.6)" @@ -2032,7 +2032,7 @@ workflows: - footer_icon: https://avatars.slack-edge.com/2025-06-24/9097205871668_a01e2ac8089c067ea5f8_512.png - footer_icon_on_error: https://avatars.slack-edge.com/2025-06-24/9097205871668_a01e2ac8089c067ea5f8_512.png - fields: | - iOS Simulators | iPhone 17 (iOS 26.2), iPhone 16 (iOS 18.6), iPhone 15 (iOS 17.5) + iOS Simulators | iPhone 17 (iOS 26.4), iPhone 16 (iOS 18.6), iPhone 15 (iOS 17.5) Branch | ${BITRISE_GIT_BRANCH} Xcode Version | ${XCODE_VERSION_INFO} - buttons: Test Results|${BITRISE_BUILD_URL}?tab=tests @@ -2051,7 +2051,7 @@ workflows: - project_path: firefox-ios/Client.xcodeproj - scheme: Fennec - configuration: Fennec_Testing - - destination: platform=iOS Simulator,name=iPhone 17,OS=26.2 + - destination: platform=iOS Simulator,name=iPhone 17,OS=26.4 - test_plan: UnitTest - test_repetition_mode: until_failure - maximum_test_repetitions: 3 @@ -2082,7 +2082,7 @@ workflows: - configuration: FocusDebug - project_path: /Users/vagrant/git/focus-ios/Blockzilla.xcodeproj - xcodebuild_options: '"COMPILER_INDEX_STORE_ENABLE=NO" "CODE_SIGN_IDENTITY=" "CODE_SIGNING_REQUIRED=NO" "CODE_SIGNING_ALLOWED=NO"' - - destination: platform=iOS Simulator,name=iPhone 17,OS=26.2 + - destination: platform=iOS Simulator,name=iPhone 17,OS=26.4 - script@1.2.1: title: Override xctestrun Focus env variables inputs: @@ -2090,16 +2090,16 @@ workflows: #!/usr/bin/env bash set -euxo pipefail # Point to the Unit tests plan instead of Accessibility - FOCUS_UI_XCTESTRUN="$BITRISE_TEST_BUNDLE_PATH/Focus_SmokeTest_iphonesimulator26.2-arm64.xctestrun" + FOCUS_UI_XCTESTRUN="$BITRISE_TEST_BUNDLE_PATH/Focus_SmokeTest_iphonesimulator26.4-arm64.xctestrun" echo "Found UITest .xctestrun: $FOCUS_UI_XCTESTRUN" envman add --key BITRISE_XCTESTRUN_FOCUS_UI_TEST_FILE_PATH --value "$FOCUS_UI_XCTESTRUN" - xcode-test-without-building@0.5.1: timeout: 1200 inputs: - - destination: platform=iOS Simulator,name=iPhone 17,OS=26.2 + - destination: platform=iOS Simulator,name=iPhone 17,OS=26.4 - xcodebuild_options: '"COMPILER_INDEX_STORE_ENABLE=NO" "CODE_SIGN_IDENTITY=" "CODE_SIGNING_REQUIRED=NO" "CODE_SIGNING_ALLOWED=NO"' - - xctestrun: $BITRISE_TEST_BUNDLE_PATH/Focus_UnitTests_iphonesimulator26.2-arm64.xctestrun + - xctestrun: $BITRISE_TEST_BUNDLE_PATH/Focus_UnitTests_iphonesimulator26.4-arm64.xctestrun - xcode-test-shard-calculation@0: inputs: - product_path: $BITRISE_XCTESTRUN_FOCUS_UI_TEST_FILE_PATH @@ -2139,13 +2139,13 @@ workflows: - configuration: KlarDebug - project_path: /Users/vagrant/git/focus-ios/Blockzilla.xcodeproj - xcodebuild_options: '"COMPILER_INDEX_STORE_ENABLE=NO" "CODE_SIGN_IDENTITY=" "CODE_SIGNING_REQUIRED=NO" "CODE_SIGNING_ALLOWED=NO"' - - destination: platform=iOS Simulator,name=iPhone 17,OS=26.2 + - destination: platform=iOS Simulator,name=iPhone 17,OS=26.4 - xcode-test-without-building@0.5.1: timeout: 1200 inputs: - - destination: platform=iOS Simulator,name=iPhone 17,OS=26.2 + - destination: platform=iOS Simulator,name=iPhone 17,OS=26.4 - xcodebuild_options: '"COMPILER_INDEX_STORE_ENABLE=NO" "CODE_SIGN_IDENTITY=" "CODE_SIGNING_REQUIRED=NO" "CODE_SIGNING_ALLOWED=NO"' - - xctestrun: $BITRISE_TEST_BUNDLE_PATH/Klar_UnitTests_iphonesimulator26.2-arm64.xctestrun + - xctestrun: $BITRISE_TEST_BUNDLE_PATH/Klar_UnitTests_iphonesimulator26.4-arm64.xctestrun - deploy-to-bitrise-io@2.10.0: {} - slack@4.2.1: run_if: ".IsBuildFailed" @@ -2180,9 +2180,9 @@ workflows: timeout: 1200 inputs: - only_testing: $BITRISE_TEST_SHARDS_PATH/$BITRISE_IO_PARALLEL_INDEX - - destination: platform=iOS Simulator,name=iPhone 17,OS=26.2 + - destination: platform=iOS Simulator,name=iPhone 17,OS=26.4 - xcodebuild_options: '"COMPILER_INDEX_STORE_ENABLE=NO" "CODE_SIGN_IDENTITY=" "CODE_SIGNING_REQUIRED=NO" "CODE_SIGNING_ALLOWED=NO"' - - xctestrun: $BITRISE_TEST_BUNDLE_PATH/Focus_SmokeTest_iphonesimulator26.2-arm64.xctestrun + - xctestrun: $BITRISE_TEST_BUNDLE_PATH/Focus_SmokeTest_iphonesimulator26.4-arm64.xctestrun - deploy-to-bitrise-io@2.10.0: {} - github-status@3.0.1: inputs: @@ -2891,5 +2891,5 @@ trigger_map: meta: bitrise.io: - stack: osx-xcode-26.3.x + stack: osx-xcode-26.4.x machine_type_id: g2.mac.4large From 0067770ba2154ac71c7bb306071e55d640985825 Mon Sep 17 00:00:00 2001 From: Clare So <1740517+clarmso@users.noreply.github.com> Date: Wed, 25 Mar 2026 14:59:29 -0400 Subject: [PATCH 2/5] Use 0.63 swiftlint instead!! --- bitrise.yml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/bitrise.yml b/bitrise.yml index 23035275f77df..f7f1f8885eeea 100644 --- a/bitrise.yml +++ b/bitrise.yml @@ -742,17 +742,6 @@ workflows: sed -i '' 's/CODE_SIGN_IDENTITY = "iPhone Developer"/CODE_SIGN_IDENTITY = "iPhone Developer"/' project.pbxproj cd - title: Set xcodeproj code_sign_identity to iPhone Developer - - script@1.2.1: - title: Pin swiftlint version to 0.62.2 (Workaround) - inputs: - - content: |- - OLD_SWIFTLINT_PATH=`which swiftlint` - curl -L -o swiftlint.zip https://github.com/realm/SwiftLint/releases/download/0.62.2/portable_swiftlint.zip - unzip swiftlint.zip -d swiftlint_bin - chmod +x swiftlint_bin/swiftlint - sudo mv swiftlint_bin/swiftlint $OLD_SWIFTLINT_PATH - which swiftlint - swiftlint version - script@1.2.1: inputs: - content: |- From 954e98f656c568966872b59ae70044a963b46ca1 Mon Sep 17 00:00:00 2001 From: Clare So <1740517+clarmso@users.noreply.github.com> Date: Thu, 26 Mar 2026 15:41:23 -0400 Subject: [PATCH 3/5] Bump references from 26.3 or 26.2 to 26.4 --- .github/workflows/firefox-ios-import-strings.yml | 2 +- .github/workflows/firefox-ios-l10n-linter.yml | 2 +- .github/workflows/firefox-ios-publish-docc.yml | 2 +- .github/workflows/focus-ios-import-strings.yml | 2 +- .github/workflows/focus-ios-l10n-linter.yml | 2 +- .github/workflows/focus-ios-l10n-locales.yml | 2 +- .github/workflows/focus-ios-l10n-screenshots.yml | 4 ++-- README.md | 4 ++-- .../Tests/SyncIntegrationTests/xcodebuild.py | 2 +- firefox-ios/l10n-screenshots.sh | 2 +- focus-ios/l10n-screenshots.sh | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/firefox-ios-import-strings.yml b/.github/workflows/firefox-ios-import-strings.yml index 084cedc859881..73f970160fd42 100644 --- a/.github/workflows/firefox-ios-import-strings.yml +++ b/.github/workflows/firefox-ios-import-strings.yml @@ -19,7 +19,7 @@ jobs: runs-on: macos-26 strategy: matrix: - xcode: ["26.3"] + xcode: ["26.4"] python-version: ["3.12"] steps: - uses: actions/checkout@v6 diff --git a/.github/workflows/firefox-ios-l10n-linter.yml b/.github/workflows/firefox-ios-l10n-linter.yml index 2b333632735bd..66c9c43ed4849 100644 --- a/.github/workflows/firefox-ios-l10n-linter.yml +++ b/.github/workflows/firefox-ios-l10n-linter.yml @@ -18,7 +18,7 @@ jobs: runs-on: macos-26 strategy: matrix: - xcode: ["26.3"] + xcode: ["26.4"] python-version: ["3.12"] node-version: ["24"] steps: diff --git a/.github/workflows/firefox-ios-publish-docc.yml b/.github/workflows/firefox-ios-publish-docc.yml index 9e0a3127cec73..703c0399fef52 100644 --- a/.github/workflows/firefox-ios-publish-docc.yml +++ b/.github/workflows/firefox-ios-publish-docc.yml @@ -22,7 +22,7 @@ jobs: runs-on: macos-26 strategy: matrix: - xcode: ["26.1"] + xcode: ["26.4"] environment: name: github-pages url: ${{ steps.deployment.outputs.page_url }} diff --git a/.github/workflows/focus-ios-import-strings.yml b/.github/workflows/focus-ios-import-strings.yml index b3f09c4ee0696..756c48d3929aa 100644 --- a/.github/workflows/focus-ios-import-strings.yml +++ b/.github/workflows/focus-ios-import-strings.yml @@ -14,7 +14,7 @@ jobs: runs-on: macos-26 strategy: matrix: - xcode: ["26.3"] + xcode: ["26.4"] python-version: ["3.12"] steps: - uses: actions/checkout@v6 diff --git a/.github/workflows/focus-ios-l10n-linter.yml b/.github/workflows/focus-ios-l10n-linter.yml index 260ed9723a3a1..6eff7d6e47e6f 100644 --- a/.github/workflows/focus-ios-l10n-linter.yml +++ b/.github/workflows/focus-ios-l10n-linter.yml @@ -20,7 +20,7 @@ jobs: runs-on: macos-26 strategy: matrix: - xcode: ["26.3"] + xcode: ["26.4"] python-version: ["3.12"] steps: - name: Clone code repository diff --git a/.github/workflows/focus-ios-l10n-locales.yml b/.github/workflows/focus-ios-l10n-locales.yml index 183a76a53a254..6f59278b90ba4 100644 --- a/.github/workflows/focus-ios-l10n-locales.yml +++ b/.github/workflows/focus-ios-l10n-locales.yml @@ -28,7 +28,7 @@ jobs: - name: Setup Xcode run: | sudo rm -rf /Applications/Xcode.app - sudo xcode-select -s /Applications/Xcode_26.3.app/Contents/Developer + sudo xcode-select -s /Applications/Xcode_26.4.app/Contents/Developer xcodebuild -version - name: Run setup scripts for Focus timeout-minutes: 10 diff --git a/.github/workflows/focus-ios-l10n-screenshots.yml b/.github/workflows/focus-ios-l10n-screenshots.yml index 75ddf2cb75be0..5d076a48ba5fd 100644 --- a/.github/workflows/focus-ios-l10n-screenshots.yml +++ b/.github/workflows/focus-ios-l10n-screenshots.yml @@ -42,7 +42,7 @@ jobs: - name: Setup Xcode run: | sudo rm -rf /Applications/Xcode.app - sudo xcode-select -s /Applications/Xcode_26.3.app/Contents/Developer + sudo xcode-select -s /Applications/Xcode_26.4.app/Contents/Developer xcodebuild -version - name: Run setup scripts for Focus run: | @@ -51,7 +51,7 @@ jobs: run: | xcodebuild build-for-testing -scheme FocusSnapshotTests \ -project focus-ios/Blockzilla.xcodeproj \ - -destination 'platform=iOS Simulator,name=iPhone 17,OS=26.2' \ + -destination 'platform=iOS Simulator,name=iPhone 17,OS=26.4' \ -derivedDataPath l10n-screenshots-dd - name: Targzip Derived Data run: | diff --git a/README.md b/README.md index 38f1031711053..41d044b4b3f3f 100644 --- a/README.md +++ b/README.md @@ -5,13 +5,13 @@ Download [Firefox iOS](https://apps.apple.com/app/firefox-web-browser/id98980492 - + - + diff --git a/firefox-ios/firefox-ios-tests/Tests/SyncIntegrationTests/xcodebuild.py b/firefox-ios/firefox-ios-tests/Tests/SyncIntegrationTests/xcodebuild.py index 64cf87f24e086..0e9f9ca57ca15 100644 --- a/firefox-ios/firefox-ios-tests/Tests/SyncIntegrationTests/xcodebuild.py +++ b/firefox-ios/firefox-ios-tests/Tests/SyncIntegrationTests/xcodebuild.py @@ -10,7 +10,7 @@ class XCodeBuild(object): binary = 'xcodebuild' - destination = 'platform=iOS Simulator,name=iPhone 17,OS=26.3.1' + destination = 'platform=iOS Simulator,name=iPhone 17,OS=26.4' logger = logging.getLogger() scheme = 'Fennec' testPlan = 'SyncIntegrationTestPlan' diff --git a/firefox-ios/l10n-screenshots.sh b/firefox-ios/l10n-screenshots.sh index 4e74f4e7fd1d8..490f2dcead869 100755 --- a/firefox-ios/l10n-screenshots.sh +++ b/firefox-ios/l10n-screenshots.sh @@ -39,7 +39,7 @@ for lang in $LOCALES; do --skip_open_summary \ --xcargs "-maximum-parallel-testing-workers 2" \ --derived_data_path l10n-screenshots-dd \ - --ios_version "26.2" \ + --ios_version "26.4" \ --erase_simulator --localize_simulator \ --devices "iPhone 17" --languages "$lang" \ --output_directory "l10n-screenshots/$lang" \ diff --git a/focus-ios/l10n-screenshots.sh b/focus-ios/l10n-screenshots.sh index 62bf7d0d36e83..b0ac552949eeb 100755 --- a/focus-ios/l10n-screenshots.sh +++ b/focus-ios/l10n-screenshots.sh @@ -44,7 +44,7 @@ for lang in $LOCALES; do --skip_open_summary \ --xcargs "-maximum-parallel-testing-workers 1" \ --erase_simulator --localize_simulator \ - --ios_version "26.1" \ + --ios_version "26.4" \ --devices "$DEVICE" \ --languages "$lang" \ --output_directory "l10n-screenshots/$lang" \ From d60cd682768162410e07d3ea599ea3439f5e4e61 Mon Sep 17 00:00:00 2001 From: Clare So <1740517+clarmso@users.noreply.github.com> Date: Thu, 26 Mar 2026 16:53:01 -0400 Subject: [PATCH 4/5] Update login page --- .../Tests/L10nSnapshotTests/L10nSuite2SnapshotTests.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/firefox-ios/firefox-ios-tests/Tests/L10nSnapshotTests/L10nSuite2SnapshotTests.swift b/firefox-ios/firefox-ios-tests/Tests/L10nSnapshotTests/L10nSuite2SnapshotTests.swift index 112f6bc00516b..723dbd1031d73 100644 --- a/firefox-ios/firefox-ios-tests/Tests/L10nSnapshotTests/L10nSuite2SnapshotTests.swift +++ b/firefox-ios/firefox-ios-tests/Tests/L10nSnapshotTests/L10nSuite2SnapshotTests.swift @@ -169,7 +169,7 @@ class L10nSuite2SnapshotTests: L10nBaseSnapshotTests { } snapshot("CreatedLoginView") - app.tables["Login List"].cells.element(boundBy: 2).waitAndTap() + app.tables["Login List"].cells.element(boundBy: 1).waitAndTap() snapshot("CreatedLoginDetailedView") app.tables["Login Detail List"].cells.element(boundBy: 4).waitAndTap() From 69bc027491231575cd31cbb4861ff54449175493 Mon Sep 17 00:00:00 2001 From: Clare So <1740517+clarmso@users.noreply.github.com> Date: Thu, 26 Mar 2026 23:29:08 -0400 Subject: [PATCH 5/5] iOS 17 and 18 are only available from edge stack --- bitrise.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bitrise.yml b/bitrise.yml index f7f1f8885eeea..98474a8ec8e78 100644 --- a/bitrise.yml +++ b/bitrise.yml @@ -2025,6 +2025,9 @@ workflows: Branch | ${BITRISE_GIT_BRANCH} Xcode Version | ${XCODE_VERSION_INFO} - buttons: Test Results|${BITRISE_BUILD_URL}?tab=tests + meta: + bitrise.io: + stack: osx-xcode-26.4.x-edge # Firefox_Unit_Tests runs the unit tests multiple times on weekdays to identify flaky tests on the latest iOS version. # The trends are reported on Bitrise Insights.
Firefox iOSFirefox-iOSFirefox-iOS Firefox-iOS Firefox-iOS
Focus iOSFocus-iOSFocus-iOS Focus-iOS Focus-iOS