From 31fc153f7e8243602d1ec9e1673daae63c23bc45 Mon Sep 17 00:00:00 2001 From: Bug Magnet Date: Wed, 11 Dec 2024 13:34:01 +0100 Subject: [PATCH] Update CI Scripts --- .github/workflows/ios-build-xcode-16.yml | 5 ----- .github/workflows/ios-screenshots-creation.yml | 9 ++------- .github/workflows/ios-screenshots-tests.yml | 11 +++-------- .github/workflows/ios-validate-build-schemas.yml | 15 +++++---------- .github/workflows/ios.yml | 15 +++++---------- 5 files changed, 15 insertions(+), 40 deletions(-) diff --git a/.github/workflows/ios-build-xcode-16.yml b/.github/workflows/ios-build-xcode-16.yml index 90a6b0077b6a..e871046310e8 100644 --- a/.github/workflows/ios-build-xcode-16.yml +++ b/.github/workflows/ios-build-xcode-16.yml @@ -41,11 +41,6 @@ jobs: with: go-version: 1.21.13 - - name: Set up yeetd to workaround XCode being slow in CI - run: | - wget https://github.com/biscuitehh/yeetd/releases/download/1.0/yeetd-normal.pkg - sudo installer -pkg yeetd-normal.pkg -target / - yeetd & - name: Configure Xcode uses: maxim-lobanov/setup-xcode@v1 with: diff --git a/.github/workflows/ios-screenshots-creation.yml b/.github/workflows/ios-screenshots-creation.yml index 5db94fda110f..64c64ac2704a 100644 --- a/.github/workflows/ios-screenshots-creation.yml +++ b/.github/workflows/ios-screenshots-creation.yml @@ -15,7 +15,7 @@ permissions: {} jobs: test: name: Take screenshots - runs-on: macos-13-xlarge + runs-on: macos-15-xlarge env: SOURCE_PACKAGES_PATH: .spm TEST_ACCOUNT: ${{ secrets.IOS_TEST_ACCOUNT_NUMBER }} @@ -28,15 +28,10 @@ jobs: with: go-version: 1.21.13 - - name: Set up yeetd to workaround XCode being slow in CI - run: | - wget https://github.com/biscuitehh/yeetd/releases/download/1.0/yeetd-normal.pkg - sudo installer -pkg yeetd-normal.pkg -target / - yeetd & - name: Configure Xcode uses: maxim-lobanov/setup-xcode@v1 with: - xcode-version: '15.0.1' + xcode-version: '16.1' - name: Configure Rust run: | rustup default stable diff --git a/.github/workflows/ios-screenshots-tests.yml b/.github/workflows/ios-screenshots-tests.yml index e510bcc35c4f..bef9a9ab025a 100644 --- a/.github/workflows/ios-screenshots-tests.yml +++ b/.github/workflows/ios-screenshots-tests.yml @@ -19,7 +19,7 @@ jobs: test: if: github.event.pull_request.merged || github.event_name == 'workflow_dispatch' name: Screenshot tests - runs-on: macos-13-xlarge + runs-on: macos-15-xlarge env: SOURCE_PACKAGES_PATH: .spm TEST_ACCOUNT: ${{ secrets.IOS_TEST_ACCOUNT_NUMBER }} @@ -40,15 +40,10 @@ jobs: with: go-version: 1.21.13 - - name: Set up yeetd to workaround XCode being slow in CI - run: | - wget https://github.com/biscuitehh/yeetd/releases/download/1.0/yeetd-normal.pkg - sudo installer -pkg yeetd-normal.pkg -target / - yeetd & - name: Configure Xcode uses: maxim-lobanov/setup-xcode@v1 with: - xcode-version: '15.0.1' + xcode-version: '16.1' - name: Configure Rust run: | rustup default stable @@ -84,7 +79,7 @@ jobs: -project MullvadVPN.xcodeproj \ -scheme MullvadVPN \ -testPlan MullvadVPNScreenshots \ - -destination "platform=iOS Simulator,name=iPhone 15" \ + -destination "platform=iOS Simulator,name=iPhone 16" \ -clonedSourcePackagesDirPath "$SOURCE_PACKAGES_PATH" \ -disableAutomaticPackageResolution \ -resultBundlePath xcode-test-report \ diff --git a/.github/workflows/ios-validate-build-schemas.yml b/.github/workflows/ios-validate-build-schemas.yml index 12f15197d2d9..8b40e71b4e6d 100644 --- a/.github/workflows/ios-validate-build-schemas.yml +++ b/.github/workflows/ios-validate-build-schemas.yml @@ -21,7 +21,7 @@ jobs: test: if: github.event.pull_request.merged == true name: Validate build schemas - runs-on: macos-13-xlarge + runs-on: macos-15-xlarge env: SOURCE_PACKAGES_PATH: .spm steps: @@ -41,15 +41,10 @@ jobs: with: go-version: 1.21.13 - - name: Set up yeetd to workaround XCode being slow in CI - run: | - wget https://github.com/biscuitehh/yeetd/releases/download/1.0/yeetd-normal.pkg - sudo installer -pkg yeetd-normal.pkg -target / - yeetd & - name: Configure Xcode uses: maxim-lobanov/setup-xcode@v1 with: - xcode-version: '15.0.1' + xcode-version: '16.1' - name: Configure Rust run: | rustup default stable @@ -82,7 +77,7 @@ jobs: -project MullvadVPN.xcodeproj \ -scheme MullvadVPN \ -configuration MockRelease \ - -destination "platform=iOS Simulator,name=iPhone 15" \ + -destination "platform=iOS Simulator,name=iPhone 16" \ -clonedSourcePackagesDirPath "$SOURCE_PACKAGES_PATH" \ -disableAutomaticPackageResolution \ build @@ -90,7 +85,7 @@ jobs: -project MullvadVPN.xcodeproj \ -scheme MullvadVPN \ -configuration Staging \ - -destination "platform=iOS Simulator,name=iPhone 15" \ + -destination "platform=iOS Simulator,name=iPhone 16" \ -clonedSourcePackagesDirPath "$SOURCE_PACKAGES_PATH" \ -disableAutomaticPackageResolution \ build @@ -98,7 +93,7 @@ jobs: -project MullvadVPN.xcodeproj \ -scheme MullvadVPNUITests \ -configuration Debug \ - -destination "platform=iOS Simulator,name=iPhone 15" \ + -destination "platform=iOS Simulator,name=iPhone 16" \ -clonedSourcePackagesDirPath "$SOURCE_PACKAGES_PATH" \ -disableAutomaticPackageResolution \ build diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index 767790d9f192..70b094cebb1a 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -15,7 +15,7 @@ permissions: {} jobs: check-formatting: name: Check formatting - runs-on: macos-13 + runs-on: macos-15 steps: - name: Install SwiftFormat run: | @@ -33,7 +33,7 @@ jobs: swiftlint: name: Run swiftlint - runs-on: macos-13 + runs-on: macos-15 steps: - name: Checkout repository uses: actions/checkout@v4 @@ -47,7 +47,7 @@ jobs: test: name: Unit tests - runs-on: macos-13-xlarge + runs-on: macos-15-xlarge env: SOURCE_PACKAGES_PATH: .spm steps: @@ -77,15 +77,10 @@ jobs: brew update brew install protobuf - - name: Set up yeetd to workaround XCode being slow in CI - run: | - wget https://github.com/biscuitehh/yeetd/releases/download/1.0/yeetd-normal.pkg - sudo installer -pkg yeetd-normal.pkg -target / - yeetd & - name: Configure Xcode uses: maxim-lobanov/setup-xcode@v1 with: - xcode-version: '15.0.1' + xcode-version: '16.1' - name: Configure Rust # Since the https://github.com/actions/runner-images/releases/tag/macos-13-arm64%2F20240721.1 release # Brew does not install tools at the correct location anymore @@ -115,7 +110,7 @@ jobs: -project MullvadVPN.xcodeproj \ -scheme MullvadVPN \ -testPlan MullvadVPNCI \ - -destination "platform=iOS Simulator,name=iPhone 15" \ + -destination "platform=iOS Simulator,name=iPhone 16" \ -clonedSourcePackagesDirPath "$SOURCE_PACKAGES_PATH" \ -disableAutomaticPackageResolution \ -resultBundlePath xcode-test-report \