From 9714bb85187bc889ebc441d5847afef75a5d6e49 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Mon, 8 Aug 2016 00:47:07 -0500 Subject: [PATCH 1/2] CI: test x86_64-pc-windows-gnu --- .travis.yml | 10 +++++++++- ci/env.sh | 3 +++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7ede66cce..4f8a384bd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,6 @@ matrix: - env: TARGET=aarch64-unknown-linux-gnu os: linux dist: trusty - sudo: required addons: apt: packages: @@ -52,6 +51,15 @@ matrix: os: osx - env: TARGET=x86_64-unknown-linux-gnu os: linux + - env: TARGET=x86_64-pc-windows-gnu + os: linux + dist: trusty + sudo: required + addons: + apt: + packages: + - gcc-mingw-w64 + - wine allow_failures: # FIXME(#2) - env: TARGET=armv7-unknown-linux-gnueabihf diff --git a/ci/env.sh b/ci/env.sh index 92f0c3eca..4016940a0 100644 --- a/ci/env.sh +++ b/ci/env.sh @@ -24,4 +24,7 @@ case $TARGET in export PREFIX=arm-linux-gnueabihf- export QEMU_LD_PREFIX=/usr/arm-linux-gnueabihf ;; + x86_64-pc-windows-gnu) + export PREFIX=x86_64-w64-mingw32- + ;; esac From bae444e5db3f8d520fea7f312da8d8ef3b0b3942 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Mon, 8 Aug 2016 01:20:03 -0500 Subject: [PATCH 2/2] install only 64-bit wine --- .travis.yml | 1 - ci/install.sh | 10 ++++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4f8a384bd..e310a4175 100644 --- a/.travis.yml +++ b/.travis.yml @@ -59,7 +59,6 @@ matrix: apt: packages: - gcc-mingw-w64 - - wine allow_failures: # FIXME(#2) - env: TARGET=armv7-unknown-linux-gnueabihf diff --git a/ci/install.sh b/ci/install.sh index 3d11092f8..94bd1fead 100644 --- a/ci/install.sh +++ b/ci/install.sh @@ -23,6 +23,15 @@ install_c_toolchain() { esac } +install_wine() { + case $TARGET in + x86_64-pc-windows-gnu) + sudo apt-get install -y --no-install-recommends \ + wine1.6-amd64 + ;; + esac +} + install_rust() { curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain=nightly @@ -51,6 +60,7 @@ EOF main() { install_binutils install_c_toolchain + install_wine install_rust add_rustup_target configure_cargo