summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2017-05-21 20:57:03 +0200
committerLinus Färnstrand <linus@mullvad.net>2017-05-21 20:57:03 +0200
commit8f5f33a79bcf8e6acf718aeb6b4fac22e97a6e4f (patch)
treead1e73d5b5a4182869bf7049d82b831367b62d29
parent5a29ec07f4d0bc41da0b64435ff156ff37e88c22 (diff)
parent46c45eb466af0df6925a74e8a7b0812457513bec (diff)
downloadmullvadvpn-8f5f33a79bcf8e6acf718aeb6b4fac22e97a6e4f.tar.xz
mullvadvpn-8f5f33a79bcf8e6acf718aeb6b4fac22e97a6e4f.zip
Merge branch 'ci-beta-builds'
-rw-r--r--.travis.yml4
-rw-r--r--appveyor.yml2
2 files changed, 6 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index 4312818114..cb2de1142d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,11 @@ cache:
rust:
- stable
+ - beta
- nightly
+matrix:
+ allow_failures:
+ - rust: nightly
os:
- linux
- osx
diff --git a/appveyor.yml b/appveyor.yml
index fbc57ab0ed..3725b4d72c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -20,6 +20,8 @@ environment:
# Testing other channels
- TARGET: x86_64-pc-windows-gnu
+ RUST_VERSION: beta
+ - TARGET: x86_64-pc-windows-gnu
RUST_VERSION: nightly
- TARGET: x86_64-pc-windows-msvc
RUST_VERSION: nightly