diff options
| author | Bug Magnet <marco.nikic@mullvad.net> | 2025-08-26 09:31:33 +0200 |
|---|---|---|
| committer | Bug Magnet <marco.nikic@mullvad.net> | 2025-08-26 10:38:13 +0200 |
| commit | 4cc9dea92b38c315faed4dec6537cae017691428 (patch) | |
| tree | d1542d7b47553760dbaba2f9e139ee68a07602ac | |
| parent | d1f81f1f29935e4ef19ca7c5a49818f8ce3af3cd (diff) | |
| download | mullvadvpn-4cc9dea92b38c315faed4dec6537cae017691428.tar.xz mullvadvpn-4cc9dea92b38c315faed4dec6537cae017691428.zip | |
Remove hotfix to force Xcode 16dot4
| -rw-r--r-- | .github/actions/ios/setup-project-toolchain/action.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/ios-screenshots-tests.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/ios-validate-build-schemas.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/ios.yml | 8 |
4 files changed, 1 insertions, 17 deletions
diff --git a/.github/actions/ios/setup-project-toolchain/action.yml b/.github/actions/ios/setup-project-toolchain/action.yml index 78cd24b1b9..bf21aefb14 100644 --- a/.github/actions/ios/setup-project-toolchain/action.yml +++ b/.github/actions/ios/setup-project-toolchain/action.yml @@ -51,7 +51,7 @@ runs: - name: Setup Xcode uses: maxim-lobanov/setup-xcode@v1 with: - xcode-version: '16.1' + xcode-version: '16.4' - name: Configure Xcode project run: | diff --git a/.github/workflows/ios-screenshots-tests.yml b/.github/workflows/ios-screenshots-tests.yml index e6c78b73ab..a091ac658e 100644 --- a/.github/workflows/ios-screenshots-tests.yml +++ b/.github/workflows/ios-screenshots-tests.yml @@ -43,10 +43,6 @@ jobs: brew update brew install zip - - name: Select Xcode version. Remove this step after 25/8 2025, when Xcode 16.4 will be the default version. - run: | - sudo xcode-select -s "/Applications/Xcode_16.4.app/Contents/Developer" - - name: Run screenshot tests run: | set -o pipefail && env NSUnbufferedIO=YES xcodebuild \ diff --git a/.github/workflows/ios-validate-build-schemas.yml b/.github/workflows/ios-validate-build-schemas.yml index b309e12f69..46d87c0077 100644 --- a/.github/workflows/ios-validate-build-schemas.yml +++ b/.github/workflows/ios-validate-build-schemas.yml @@ -32,10 +32,6 @@ jobs: - name: Setup project uses: ./.github/actions/ios/setup-project-toolchain - - name: Select Xcode version. Remove this step after 25/8 2025, when Xcode 16.4 will be the default version. - run: | - sudo xcode-select -s "/Applications/Xcode_16.4.app/Contents/Developer" - - name: Run build validation for Staging and MockRelease configurations as well as the MullvadVPNUITests target run: | set -o pipefail && env NSUnbufferedIO=YES xcodebuild \ diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index 7ba6aaf59f..48184d848d 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -58,10 +58,6 @@ jobs: - name: Setup project uses: ./.github/actions/ios/setup-project-toolchain - - name: Select Xcode version. Remove this step after 25/8 2025, when Xcode 16.4 will be the default version. - run: | - sudo xcode-select -s "/Applications/Xcode_16.4.app/Contents/Developer" - - name: Build for ui tests run: | set -o pipefail && env NSUnbufferedIO=YES xcodebuild \ @@ -86,10 +82,6 @@ jobs: - name: Setup project uses: ./.github/actions/ios/setup-project-toolchain - - name: Select Xcode version. Remove this step after 25/8 2025, when Xcode 16.4 will be the default version. - run: | - sudo xcode-select -s "/Applications/Xcode_16.4.app/Contents/Developer" - - name: Run unit tests run: | set -o pipefail && env NSUnbufferedIO=YES xcodebuild \ |