diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2025-10-16 15:38:12 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2025-10-16 15:38:12 +0200 |
| commit | 0817c77c2e55bf7aa2d8e877352f17ce8cff8a54 (patch) | |
| tree | cf89af28c980bd0a830df103319b5788a928cdb5 | |
| parent | f1507c141413d2735e5c09bbd0e3af10646dff05 (diff) | |
| parent | f61724d532c0ea5fc90a535235458668e719ddee (diff) | |
| download | mullvadvpn-0817c77c2e55bf7aa2d8e877352f17ce8cff8a54.tar.xz mullvadvpn-0817c77c2e55bf7aa2d8e877352f17ce8cff8a54.zip | |
Merge branch 'remove-superfluous-rustup-update'
| -rwxr-xr-x | ci/buildserver-build.sh | 6 | ||||
| -rwxr-xr-x | test/scripts/run/ci.sh | 6 |
2 files changed, 0 insertions, 12 deletions
diff --git a/ci/buildserver-build.sh b/ci/buildserver-build.sh index 4a5cf6790f..00e20a078c 100755 --- a/ci/buildserver-build.sh +++ b/ci/buildserver-build.sh @@ -189,12 +189,6 @@ function build_ref { checkout_ref "$ref" || return 1 - # When we build in containers, the updating of toolchains is done by updating containers. - if [[ "$(uname -s)" != "Linux" ]]; then - echo "Updating Rust toolchain..." - rustup update - fi - # podman appends a trailing carriage return to the output. So we use `tr` to strip it local version="" version="$(run_in_build_env cargo run -q --bin mullvad-version | tr -d "\r" || return 1)" diff --git a/test/scripts/run/ci.sh b/test/scripts/run/ci.sh index b7e8c218e4..f2c94306cf 100755 --- a/test/scripts/run/ci.sh +++ b/test/scripts/run/ci.sh @@ -22,12 +22,6 @@ fi TEST_OS=$1 -if [[ "$(uname -s)" == "Darwin" ]]; then - # NOTE: We only do this on macOS since we use containers otherwise - echo "Updating Rust toolchain" - rustup update -fi - # shellcheck source=test/scripts/utils/lib.sh source "../utils/lib.sh" |