From 15c3925b1e1cbfde9b6c76c01e5d3ee62ecc23ee Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Wed, 17 Oct 2018 14:46:21 +0200 Subject: [PATCH 1/2] Enable Windows testing under travis --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 1cefdcb2..2f45b772 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,7 @@ rust: os: - linux - osx + - windows cache: cargo: true @@ -31,6 +32,7 @@ addons: install: - if [ $TRAVIS_OS_NAME = osx ]; then brew update; brew install qemu; fi + - if [ $TRAVIS_OS_NAME = windows ]; then wget https://qemu.weilnetz.de/w64/2018/qemu-w64-setup-20180801.exe; 7z x qemu-w64-setup-20180801.exe; fi before_script: - rustup component add rust-src From 00d869952d2c900a69b06eed8c75628a981e9f6a Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Thu, 18 Oct 2018 14:23:41 +0200 Subject: [PATCH 2/2] Only use travis for bors --- bors.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/bors.toml b/bors.toml index e9bb6c7c..574c5632 100644 --- a/bors.toml +++ b/bors.toml @@ -1,5 +1,4 @@ status = [ "continuous-integration/travis-ci/push", - "continuous-integration/appveyor/branch", ] delete_merged_branches = true