diff options
| author | Bug Magnet <marco.nikic@mullvad.net> | 2024-03-25 17:26:24 +0100 |
|---|---|---|
| committer | Bug Magnet <marco.nikic@mullvad.net> | 2024-03-25 17:26:24 +0100 |
| commit | ce9ab55013a23b065526376b53e906ce8aef3784 (patch) | |
| tree | 4c835b77f84f06990af48e0ffec59862f553f75d | |
| parent | 030d55d7568318010090c6be01e30f5cbbb4e1bb (diff) | |
| parent | ed7b7e2b10fbec05e277340880ae7ed9c43d3e45 (diff) | |
| download | mullvadvpn-ce9ab55013a23b065526376b53e906ce8aef3784.tar.xz mullvadvpn-ce9ab55013a23b065526376b53e906ce8aef3784.zip | |
Merge branch 'fix-broken-ios-ci-by-updating-rust-ios-576'
| -rw-r--r-- | .github/workflows/ios-end-to-end-tests.yml | 5 | ||||
| -rw-r--r-- | .github/workflows/ios-screenshots-creation.yml | 5 | ||||
| -rw-r--r-- | .github/workflows/ios-screenshots-tests.yml | 5 | ||||
| -rw-r--r-- | .github/workflows/ios-validate-build-schemas.yml | 6 | ||||
| -rw-r--r-- | .github/workflows/ios.yml | 5 |
5 files changed, 21 insertions, 5 deletions
diff --git a/.github/workflows/ios-end-to-end-tests.yml b/.github/workflows/ios-end-to-end-tests.yml index 61e8092367..6f953cd346 100644 --- a/.github/workflows/ios-end-to-end-tests.yml +++ b/.github/workflows/ios-end-to-end-tests.yml @@ -30,7 +30,10 @@ jobs: uses: actions/checkout@v4 - name: Configure Rust - run: rustup target add aarch64-apple-ios aarch64-apple-ios-sim + run: | + rustup default stable + rustup update stable + rustup target add aarch64-apple-ios aarch64-apple-ios-sim - name: Configure Xcode project run: | diff --git a/.github/workflows/ios-screenshots-creation.yml b/.github/workflows/ios-screenshots-creation.yml index 69de59e1e4..4b7e6a3692 100644 --- a/.github/workflows/ios-screenshots-creation.yml +++ b/.github/workflows/ios-screenshots-creation.yml @@ -31,7 +31,10 @@ jobs: with: xcode-version: '15.0.1' - name: Configure Rust - run: rustup target add aarch64-apple-ios-sim x86_64-apple-ios + run: | + rustup default stable + rustup update stable + rustup target add aarch64-apple-ios-sim x86_64-apple-ios - name: Configure Xcode project run: | diff --git a/.github/workflows/ios-screenshots-tests.yml b/.github/workflows/ios-screenshots-tests.yml index e4173634ee..adba047322 100644 --- a/.github/workflows/ios-screenshots-tests.yml +++ b/.github/workflows/ios-screenshots-tests.yml @@ -47,7 +47,10 @@ jobs: with: xcode-version: '15.0.1' - name: Configure Rust - run: rustup target add aarch64-apple-ios-sim + run: | + rustup default stable + rustup update stable + rustup target add aarch64-apple-ios-sim - name: Configure Xcode project run: | diff --git a/.github/workflows/ios-validate-build-schemas.yml b/.github/workflows/ios-validate-build-schemas.yml index d2a042182a..12057518ab 100644 --- a/.github/workflows/ios-validate-build-schemas.yml +++ b/.github/workflows/ios-validate-build-schemas.yml @@ -12,6 +12,7 @@ on: - ios/.swiftformat - ios/**/*.swift - ios/**/*.xctestplan + - Cargo.toml workflow_dispatch: jobs: test: @@ -47,7 +48,10 @@ jobs: with: xcode-version: '15.0.1' - name: Configure Rust - run: rustup target add aarch64-apple-ios-sim x86_64-apple-ios + run: | + rustup default stable + rustup update stable + rustup target add aarch64-apple-ios-sim x86_64-apple-ios - name: Configure Xcode project run: | diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index f7f69c4e45..f0c12323c3 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -74,7 +74,10 @@ jobs: with: xcode-version: '15.0.1' - name: Configure Rust - run: rustup target add aarch64-apple-ios-sim + run: | + rustup default stable + rustup update stable + rustup target add aarch64-apple-ios-sim - name: Configure Xcode project run: | |