Skip to content

Commit 63cbbe3

Browse files
committed
Update all the CI scripts
1 parent 372cf99 commit 63cbbe3

File tree

3 files changed

+42
-15
lines changed

3 files changed

+42
-15
lines changed

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

+14-5
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,6 @@ jobs:
3434
uses: maxim-lobanov/setup-xcode@v1
3535
with:
3636
xcode-version: '15.0.1'
37-
- name: Configure Rust
38-
run: |
39-
rustup default stable
40-
rustup update stable
41-
rustup target add aarch64-apple-ios-sim x86_64-apple-ios
4237

4338
- name: Configure Xcode project
4439
run: |
@@ -57,6 +52,20 @@ jobs:
5752
brew update
5853
brew install protobuf
5954
55+
- name: Configure Rust
56+
# Since the https://github.com/actions/runner-images/releases/tag/macos-13-arm64%2F20240721.1 release
57+
# Brew does not install tools at the correct location anymore
58+
# This update broke the rust build script which was assuming the cargo binary was located in ~/.cargo/bin/cargo
59+
# The workaround is to fix brew paths by running brew bundle dump, and then brew bundle
60+
# WARNING: This has to be the last brew "upgrade" commands that is ran,
61+
# otherwise the brew path will be broken again.
62+
run: |
63+
brew bundle dump
64+
brew bundle
65+
rustup default stable
66+
rustup update stable
67+
rustup target add aarch64-apple-ios-sim x86_64-apple-ios
68+
6069
- name: Create screenshots
6170
run: bundle exec fastlane snapshot --cloned_source_packages_path "$SOURCE_PACKAGES_PATH"
6271
working-directory: ios

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

+14-5
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,6 @@ jobs:
4646
uses: maxim-lobanov/setup-xcode@v1
4747
with:
4848
xcode-version: '15.0.1'
49-
- name: Configure Rust
50-
run: |
51-
rustup default stable
52-
rustup update stable
53-
rustup target add aarch64-apple-ios-sim
5449

5550
- name: Configure Xcode project
5651
run: |
@@ -75,6 +70,20 @@ jobs:
7570
brew update
7671
brew install protobuf
7772
73+
- name: Configure Rust
74+
# Since the https://github.com/actions/runner-images/releases/tag/macos-13-arm64%2F20240721.1 release
75+
# Brew does not install tools at the correct location anymore
76+
# This update broke the rust build script which was assuming the cargo binary was located in ~/.cargo/bin/cargo
77+
# The workaround is to fix brew paths by running brew bundle dump, and then brew bundle
78+
# WARNING: This has to be the last brew "upgrade" commands that is ran,
79+
# otherwise the brew path will be broken again.
80+
run: |
81+
brew bundle dump
82+
brew bundle
83+
rustup default stable
84+
rustup update stable
85+
rustup target add aarch64-apple-ios-sim
86+
7887
- name: Run screenshot tests
7988
run: |
8089
set -o pipefail && env NSUnbufferedIO=YES xcodebuild \

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

+14-5
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,6 @@ jobs:
4747
uses: maxim-lobanov/setup-xcode@v1
4848
with:
4949
xcode-version: '15.0.1'
50-
- name: Configure Rust
51-
run: |
52-
rustup default stable
53-
rustup update stable
54-
rustup target add aarch64-apple-ios-sim x86_64-apple-ios
5550

5651
- name: Configure Xcode project
5752
run: |
@@ -73,6 +68,20 @@ jobs:
7368
brew update
7469
brew install protobuf
7570
71+
- name: Configure Rust
72+
# Since the https://github.com/actions/runner-images/releases/tag/macos-13-arm64%2F20240721.1 release
73+
# Brew does not install tools at the correct location anymore
74+
# This update broke the rust build script which was assuming the cargo binary was located in ~/.cargo/bin/cargo
75+
# The workaround is to fix brew paths by running brew bundle dump, and then brew bundle
76+
# WARNING: This has to be the last brew "upgrade" commands that is ran,
77+
# otherwise the brew path will be broken again.
78+
run: |
79+
brew bundle dump
80+
brew bundle
81+
rustup default stable
82+
rustup update stable
83+
rustup target add aarch64-apple-ios-sim x86_64-apple-ios
84+
7685
- name: Run build validation for Staging and MockRelease configurations as well as the MullvadVPNUITests target
7786
run: |
7887
set -o pipefail && env NSUnbufferedIO=YES xcodebuild \

0 commit comments

Comments
 (0)