diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2018-08-28 13:36:22 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2018-08-28 14:12:42 +0200 |
| commit | cb9c684a0c4612018e0379c8cd0aeaa86015ebab (patch) | |
| tree | 8f2235d9d8dea2082871701b730ff7329f00f46e | |
| parent | 34ec7e5d40da9a9fb3ef9c0858a27db18fca8682 (diff) | |
| download | mullvadvpn-cb9c684a0c4612018e0379c8cd0aeaa86015ebab.tar.xz mullvadvpn-cb9c684a0c4612018e0379c8cd0aeaa86015ebab.zip | |
Make CI source env.{sh,ps1}
| -rw-r--r-- | .travis.yml | 19 | ||||
| -rw-r--r-- | appveyor.yml | 3 |
2 files changed, 4 insertions, 18 deletions
diff --git a/.travis.yml b/.travis.yml index c8e66e01c6..7b9e742d99 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,4 @@ sudo: false -env: - global: - - MACOSX_DEPLOYMENT_TARGET="10.7" - - LIBMNL_LIB_DIR="$TRAVIS_BUILD_DIR/dist-assets/binaries/linux" - - LIBNFTNL_LIB_DIR="$TRAVIS_BUILD_DIR/dist-assets/binaries/linux" git: submodules: false @@ -47,10 +42,8 @@ matrix: rust: stable os: osx cache: cargo - env: - - OPENSSL_LIB_DIR="$TRAVIS_BUILD_DIR/dist-assets/binaries/macos" - - OPENSSL_INCLUDE_DIR="$TRAVIS_BUILD_DIR/dist-assets/binaries/macos/include" - before_script: + before_script: &rust_before_script + - source env.sh - env script: &rust_script - cargo build --verbose @@ -68,11 +61,7 @@ matrix: packages: - binutils cache: cargo - env: &rust_linux_env - - OPENSSL_LIB_DIR="$TRAVIS_BUILD_DIR/dist-assets/binaries/linux" - - OPENSSL_INCLUDE_DIR="$TRAVIS_BUILD_DIR/dist-assets/binaries/linux/include" - before_script: &rust_before_script - - env + before_script: *rust_before_script script: - cargo build --verbose - cargo test --verbose @@ -86,7 +75,6 @@ matrix: os: linux addons: *rust_linux_addons cache: cargo - env: *rust_linux_env before_script: *rust_before_script script: *rust_script @@ -95,7 +83,6 @@ matrix: os: linux addons: *rust_linux_addons cache: cargo - env: *rust_linux_env before_script: *rust_before_script script: *rust_script diff --git a/appveyor.yml b/appveyor.yml index bb2cb78f50..686e4ea1f3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -37,8 +37,6 @@ install: } ElseIf ($Env:TARGET -eq 'i686-pc-windows-gnu') { $Env:PATH += ';C:\msys64\mingw32\bin' } - - ps: $Env:OPENSSL_LIB_DIR = $Env:APPVEYOR_BUILD_FOLDER + "\dist-assets\binaries\windows" - - ps: $Env:OPENSSL_INCLUDE_DIR = $Env:APPVEYOR_BUILD_FOLDER + "\dist-assets\binaries\windows\include" - curl -sSf -o rustup-init.exe https://win.rustup.rs/ - rustup-init.exe -y --default-host %TARGET% --default-toolchain %RUST_VERSION% @@ -52,6 +50,7 @@ install: # This is the "test phase", tweak it as you see fit test_script: + - ps: . .\env.ps1 - bash -x build_windows_modules.sh - cargo build - cargo test |