diff options
| -rw-r--r-- | .travis.yml | 52 | ||||
| -rw-r--r-- | Dockerfile | 2 | ||||
| -rw-r--r-- | ci/rust-linux-script.sh | 14 |
3 files changed, 37 insertions, 31 deletions
diff --git a/.travis.yml b/.travis.yml index ed1c113976..5af232a9f1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -58,48 +58,40 @@ matrix: - language: rust rust: stable os: osx - before_script: &rust_before_script + before_script: - source env.sh - export RUSTFLAGS="--deny unused_imports --deny dead_code" - env - script: &rust_script + script: - cargo build --verbose - cargo test --verbose # Daemon - Linux - - language: rust - rust: nightly - os: linux - addons: &rust_linux_addons - apt: - sources: - - sourceline: "ppa:jonathonf/gcc-7.3" - key_url: "https://pgp.key-server.io/download/0xE03043828C3FF4BB" - packages: - - binutils - - libdbus-1-dev - before_script: *rust_before_script + - os: linux + language: minimal + dist: xenial + services: docker + before_script: &rust_before_script + - docker run -d --name mvd-build -v $(pwd):/travis -w /travis mullvadvpn/mullvadvpn-app-build:latest tail -f /dev/null + - docker ps script: - - cargo build --verbose - - cargo test --verbose - # Install and run rustfmt on nightly only until rustfmt.toml settings are stabilized. - - rustup component add rustfmt-preview - - cargo fmt --version || true - - cargo fmt -- --check --unstable-features + - docker exec -t mvd-build bash ci/rust-linux-script.sh nightly - - language: rust - rust: beta - os: linux - addons: *rust_linux_addons + - os: linux + language: minimal + dist: xenial + services: docker before_script: *rust_before_script - script: *rust_script + script: + - docker exec -t mvd-build bash ci/rust-linux-script.sh beta - - language: rust - rust: stable - os: linux - addons: *rust_linux_addons + - os: linux + language: minimal + dist: xenial + services: docker before_script: *rust_before_script - script: *rust_script + script: + - docker exec -t mvd-build bash ci/rust-linux-script.sh stable notifications: diff --git a/Dockerfile b/Dockerfile index 949148cce5..44490598d1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -# To build the image: +# To build the image: # docker build . -t mullvadvpn/mullvadvpn-app-build # To push the image to our docker hub: # docker push mullvadvpn/mullvadvpn-app-build diff --git a/ci/rust-linux-script.sh b/ci/rust-linux-script.sh new file mode 100644 index 0000000000..fefe04d1f8 --- /dev/null +++ b/ci/rust-linux-script.sh @@ -0,0 +1,14 @@ +set -eu +RUST_TOOLCHAIN_CHANNEL=$1 + +source env.sh "" +rustup update $RUST_TOOLCHAIN_CHANNEL +rustup default $RUST_TOOLCHAIN_CHANNEL + +cargo build --verbose +cargo test --verbose +if [ "${RUST_TOOLCHAIN_CHANNEL}" = "nightly" ]; then + rustup component add rustfmt-preview; + rustfmt --version; + cargo fmt -- --check --unstable-features; +fi |