diff options
| author | Emīls Piņķis <emils@mullvad.net> | 2018-07-04 20:50:04 +0100 |
|---|---|---|
| committer | Emīls Piņķis <emils@mullvad.net> | 2018-07-05 16:05:36 +0100 |
| commit | 670b2f39019803d13a3ed42596db80a4f02d1bcb (patch) | |
| tree | 9c95b08d1601da9e6466af9de5cd1f232abd8e2a | |
| parent | 33b8faef5903f4f830e0c85f59058de89224ad1d (diff) | |
| download | mullvadvpn-670b2f39019803d13a3ed42596db80a4f02d1bcb.tar.xz mullvadvpn-670b2f39019803d13a3ed42596db80a4f02d1bcb.zip | |
Set correct environment variables in appveyor
| -rw-r--r-- | appveyor.yml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/appveyor.yml b/appveyor.yml index ec272fd61c..bb2cb78f50 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -15,8 +15,6 @@ environment: RUST_BACKTRACE: "1" CPP_BUILD_MODES: "Debug" OPENSSL_STATIC: "1" - OPENSSL_LIB_DIR: %APPVEYOR_BUILD_FOLDER%\dist-assets\binaries\windows - OPENSSL_INCLUDE_DIR: %APPVEYOR_BUILD_FOLDER%\dist-assets\binaries\windows\include # These are all the build jobs. Adjust as necessary. Comment out what you # don't need @@ -39,6 +37,9 @@ 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% - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin @@ -52,9 +53,8 @@ install: # This is the "test phase", tweak it as you see fit test_script: - bash -x build_windows_modules.sh - - ps: >- - cargo build - cargo test + - cargo build + - cargo test # Stops feature branches from triggering two builds (One for branch and one for PR) skip_branch_with_pr: true |