diff options
| author | David Lönnhager <david.l@mullvad.net> | 2019-11-14 13:36:58 +0100 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2019-11-18 13:24:19 +0100 |
| commit | 4ab0f188bf60e5ee66441f4fa6a4ae0f889f267d (patch) | |
| tree | 56405bc3e624909d6884af182e121b6432a1bedb | |
| parent | f070df88094154ce5abe82d74abf8ccd89392fe8 (diff) | |
| download | mullvadvpn-4ab0f188bf60e5ee66441f4fa6a4ae0f889f267d.tar.xz mullvadvpn-4ab0f188bf60e5ee66441f4fa6a4ae0f889f267d.zip | |
Install VS 2019 in Travis builds
| -rw-r--r-- | .travis.yml | 10 | ||||
| -rwxr-xr-x | ci/ci-rust-script.sh | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 07631d4334..4c7bf836d0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -126,14 +126,20 @@ matrix: - os: windows name: Daemon, Windows - stable Rust env: RUST_VERSION=stable - language: bash + language: shell + before_install: &rust_windows_before_install + - curl -s https://download.visualstudio.microsoft.com/download/pr/57d28351-e762-4ee1-aca4-16b6d3faaa33/34fa4c9bb790f310c908ff59071949289dc3ed503bcb44723c2e0b360c51ebab/vs_BuildTools.exe --output vs_BuildTools.exe + - echo "34fa4c9bb790f310c908ff59071949289dc3ed503bcb44723c2e0b360c51ebab vs_BuildTools.exe" | sha256sum -c + - ./vs_BuildTools.exe --wait -q --norestart --add Microsoft.VisualStudio.Workload.VCTools\;includeRecommended --add Microsoft.Component.MSBuild --add Microsoft.VisualStudio.Component.VC.ATL + - git submodule update --init script: &rust_windows_script - ./ci/ci-rust-script.sh $RUST_VERSION - os: windows name: Daemon, Windows - beta Rust env: RUST_VERSION=beta - language: bash + language: shell + before_install: *rust_windows_before_install script: *rust_windows_script diff --git a/ci/ci-rust-script.sh b/ci/ci-rust-script.sh index 910b32f381..1827381365 100755 --- a/ci/ci-rust-script.sh +++ b/ci/ci-rust-script.sh @@ -27,7 +27,7 @@ time rustup toolchain install $RUST_TOOLCHAIN_CHANNEL --no-self-update -c rustfm case "$(uname -s)" in MINGW*|MSYS_NT*) - export PATH="/c/Program Files (x86)/Microsoft Visual Studio/2017/BuildTools/MSBuild/15.0/Bin/amd64/:$PATH" + export PATH="/c/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/MSBuild/Current/Bin/amd64/:$PATH" time ./build_windows_modules.sh --dev-build ;; esac |