diff options
| author | Emīls <emils@mullvad.net> | 2018-07-04 20:46:06 +0100 |
|---|---|---|
| committer | Emīls Piņķis <emils@mullvad.net> | 2018-07-05 16:05:36 +0100 |
| commit | 33b8faef5903f4f830e0c85f59058de89224ad1d (patch) | |
| tree | 0c5ec4f1e94eb0f99efb690e9696596e7b6dd639 | |
| parent | 1da6d62e3e43c717a99cdf5f5c6fcff872955e86 (diff) | |
| download | mullvadvpn-33b8faef5903f4f830e0c85f59058de89224ad1d.tar.xz mullvadvpn-33b8faef5903f4f830e0c85f59058de89224ad1d.zip | |
Attempt at fixing CI with the use of clean and severely dirty hacks
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | appveyor.yml | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 209c0424f6..34eb5e73d9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,6 +40,10 @@ matrix: before_script: &rust_before_script - env + - sudo apt-get install g++-7 binutils-2.26 + - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 90 + - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-7 90 + export PATH=/usr/lib/binutils-2.26/bin:${PATH} script: &rust_script - cargo build --verbose - cargo test --verbose diff --git a/appveyor.yml b/appveyor.yml index e6a0e0680f..ec272fd61c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -14,6 +14,9 @@ environment: RUST_VERSION: stable 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 @@ -50,9 +53,6 @@ install: test_script: - bash -x build_windows_modules.sh - ps: >- - $Env:OPENSSL_STATIC = "1" - $Env:OPENSSL_LIB_DIR = $Env:APPVEYOR_BUILD_FOLDER\dist-assets\binaries\windows - $Env:OPENSSL_INCLUDE_DIR = $Env:APPVEYOR_BUILD_FOLDER\dist-assets\binaries\windows\include cargo build cargo test |