diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2019-10-07 15:48:19 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2019-10-07 15:48:19 +0200 |
| commit | a504a4e00ac46fdfdd7daf8c95ef34714b383460 (patch) | |
| tree | 30e2ea671fc1183aca24ad4061e9f81b0f149829 | |
| parent | 49014f53b3ea60a7c37930e2018314f2aac7d1eb (diff) | |
| parent | 137dffcb9fa1f9530feffa40b402099319f115cd (diff) | |
| download | mullvadvpn-a504a4e00ac46fdfdd7daf8c95ef34714b383460.tar.xz mullvadvpn-a504a4e00ac46fdfdd7daf8c95ef34714b383460.zip | |
Merge branch 'ignore-formatting-check-error'
| -rwxr-xr-x | ci/ci-rust-script.sh | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/ci/ci-rust-script.sh b/ci/ci-rust-script.sh index ba4f93e131..90042307ce 100755 --- a/ci/ci-rust-script.sh +++ b/ci/ci-rust-script.sh @@ -24,9 +24,12 @@ if [ "${RUST_TOOLCHAIN_CHANNEL}" != "nightly" ]; then fi if [ "${RUST_TOOLCHAIN_CHANNEL}" = "nightly" ]; then - rustup component add rustfmt-preview; - rustfmt --version; - cargo fmt -- --check --unstable-features; + if rustup component add rustfmt-preview; then + rustfmt --version; + cargo fmt -- --check --unstable-features; + else + echo "There seems to not be any rustfmt for the current nighly. Skipping formatting check!" + fi fi if ! git diff-index --quiet HEAD; then |