Skip to content

Commit 39d30b7

Browse files
committed
Update CI Scripts
1 parent b72e98d commit 39d30b7

5 files changed

+15
-40
lines changed

.github/workflows/ios-build-xcode-16.yml

-5
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,6 @@ jobs:
4141
with:
4242
go-version: 1.21.13
4343

44-
- name: Set up yeetd to workaround XCode being slow in CI
45-
run: |
46-
wget https://github.com/biscuitehh/yeetd/releases/download/1.0/yeetd-normal.pkg
47-
sudo installer -pkg yeetd-normal.pkg -target /
48-
yeetd &
4944
- name: Configure Xcode
5045
uses: maxim-lobanov/setup-xcode@v1
5146
with:

.github/workflows/ios-screenshots-creation.yml

+2-7
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ permissions: {}
1515
jobs:
1616
test:
1717
name: Take screenshots
18-
runs-on: macos-13-xlarge
18+
runs-on: macos-15-xlarge
1919
env:
2020
SOURCE_PACKAGES_PATH: .spm
2121
TEST_ACCOUNT: ${{ secrets.IOS_TEST_ACCOUNT_NUMBER }}
@@ -28,15 +28,10 @@ jobs:
2828
with:
2929
go-version: 1.21.13
3030

31-
- name: Set up yeetd to workaround XCode being slow in CI
32-
run: |
33-
wget https://github.com/biscuitehh/yeetd/releases/download/1.0/yeetd-normal.pkg
34-
sudo installer -pkg yeetd-normal.pkg -target /
35-
yeetd &
3631
- name: Configure Xcode
3732
uses: maxim-lobanov/setup-xcode@v1
3833
with:
39-
xcode-version: '15.0.1'
34+
xcode-version: '16.1'
4035
- name: Configure Rust
4136
run: |
4237
rustup default stable

.github/workflows/ios-screenshots-tests.yml

+3-8
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
test:
2020
if: github.event.pull_request.merged || github.event_name == 'workflow_dispatch'
2121
name: Screenshot tests
22-
runs-on: macos-13-xlarge
22+
runs-on: macos-15-xlarge
2323
env:
2424
SOURCE_PACKAGES_PATH: .spm
2525
TEST_ACCOUNT: ${{ secrets.IOS_TEST_ACCOUNT_NUMBER }}
@@ -40,15 +40,10 @@ jobs:
4040
with:
4141
go-version: 1.21.13
4242

43-
- name: Set up yeetd to workaround XCode being slow in CI
44-
run: |
45-
wget https://github.com/biscuitehh/yeetd/releases/download/1.0/yeetd-normal.pkg
46-
sudo installer -pkg yeetd-normal.pkg -target /
47-
yeetd &
4843
- name: Configure Xcode
4944
uses: maxim-lobanov/setup-xcode@v1
5045
with:
51-
xcode-version: '15.0.1'
46+
xcode-version: '16.1'
5247
- name: Configure Rust
5348
run: |
5449
rustup default stable
@@ -84,7 +79,7 @@ jobs:
8479
-project MullvadVPN.xcodeproj \
8580
-scheme MullvadVPN \
8681
-testPlan MullvadVPNScreenshots \
87-
-destination "platform=iOS Simulator,name=iPhone 15" \
82+
-destination "platform=iOS Simulator,name=iPhone 16" \
8883
-clonedSourcePackagesDirPath "$SOURCE_PACKAGES_PATH" \
8984
-disableAutomaticPackageResolution \
9085
-resultBundlePath xcode-test-report \

.github/workflows/ios-validate-build-schemas.yml

+5-10
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
test:
2222
if: github.event.pull_request.merged == true
2323
name: Validate build schemas
24-
runs-on: macos-13-xlarge
24+
runs-on: macos-15-xlarge
2525
env:
2626
SOURCE_PACKAGES_PATH: .spm
2727
steps:
@@ -41,15 +41,10 @@ jobs:
4141
with:
4242
go-version: 1.21.13
4343

44-
- name: Set up yeetd to workaround XCode being slow in CI
45-
run: |
46-
wget https://github.com/biscuitehh/yeetd/releases/download/1.0/yeetd-normal.pkg
47-
sudo installer -pkg yeetd-normal.pkg -target /
48-
yeetd &
4944
- name: Configure Xcode
5045
uses: maxim-lobanov/setup-xcode@v1
5146
with:
52-
xcode-version: '15.0.1'
47+
xcode-version: '16.1'
5348
- name: Configure Rust
5449
run: |
5550
rustup default stable
@@ -82,23 +77,23 @@ jobs:
8277
-project MullvadVPN.xcodeproj \
8378
-scheme MullvadVPN \
8479
-configuration MockRelease \
85-
-destination "platform=iOS Simulator,name=iPhone 15" \
80+
-destination "platform=iOS Simulator,name=iPhone 16" \
8681
-clonedSourcePackagesDirPath "$SOURCE_PACKAGES_PATH" \
8782
-disableAutomaticPackageResolution \
8883
build
8984
set -o pipefail && env NSUnbufferedIO=YES xcodebuild \
9085
-project MullvadVPN.xcodeproj \
9186
-scheme MullvadVPN \
9287
-configuration Staging \
93-
-destination "platform=iOS Simulator,name=iPhone 15" \
88+
-destination "platform=iOS Simulator,name=iPhone 16" \
9489
-clonedSourcePackagesDirPath "$SOURCE_PACKAGES_PATH" \
9590
-disableAutomaticPackageResolution \
9691
build
9792
set -o pipefail && env NSUnbufferedIO=YES xcodebuild \
9893
-project MullvadVPN.xcodeproj \
9994
-scheme MullvadVPNUITests \
10095
-configuration Debug \
101-
-destination "platform=iOS Simulator,name=iPhone 15" \
96+
-destination "platform=iOS Simulator,name=iPhone 16" \
10297
-clonedSourcePackagesDirPath "$SOURCE_PACKAGES_PATH" \
10398
-disableAutomaticPackageResolution \
10499
build

.github/workflows/ios.yml

+5-10
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ permissions: {}
1515
jobs:
1616
check-formatting:
1717
name: Check formatting
18-
runs-on: macos-13
18+
runs-on: macos-15
1919
steps:
2020
- name: Install SwiftFormat
2121
run: |
@@ -33,7 +33,7 @@ jobs:
3333

3434
swiftlint:
3535
name: Run swiftlint
36-
runs-on: macos-13
36+
runs-on: macos-15
3737
steps:
3838
- name: Checkout repository
3939
uses: actions/checkout@v4
@@ -47,7 +47,7 @@ jobs:
4747

4848
test:
4949
name: Unit tests
50-
runs-on: macos-13-xlarge
50+
runs-on: macos-15-xlarge
5151
env:
5252
SOURCE_PACKAGES_PATH: .spm
5353
steps:
@@ -77,15 +77,10 @@ jobs:
7777
brew update
7878
brew install protobuf
7979
80-
- name: Set up yeetd to workaround XCode being slow in CI
81-
run: |
82-
wget https://github.com/biscuitehh/yeetd/releases/download/1.0/yeetd-normal.pkg
83-
sudo installer -pkg yeetd-normal.pkg -target /
84-
yeetd &
8580
- name: Configure Xcode
8681
uses: maxim-lobanov/setup-xcode@v1
8782
with:
88-
xcode-version: '15.0.1'
83+
xcode-version: '16.1'
8984
- name: Configure Rust
9085
# Since the https://github.com/actions/runner-images/releases/tag/macos-13-arm64%2F20240721.1 release
9186
# Brew does not install tools at the correct location anymore
@@ -115,7 +110,7 @@ jobs:
115110
-project MullvadVPN.xcodeproj \
116111
-scheme MullvadVPN \
117112
-testPlan MullvadVPNCI \
118-
-destination "platform=iOS Simulator,name=iPhone 15" \
113+
-destination "platform=iOS Simulator,name=iPhone 16" \
119114
-clonedSourcePackagesDirPath "$SOURCE_PACKAGES_PATH" \
120115
-disableAutomaticPackageResolution \
121116
-resultBundlePath xcode-test-report \

0 commit comments

Comments
 (0)