Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Auto merge of #3418 - phansch:add_travis_windows_build, r=<try>
Browse files Browse the repository at this point in the history
Fix Travis Windows build

Closes #3306
bors committed Dec 25, 2018

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
2 parents fc24fce + 0d94fbe commit ac8868e
Showing 1 changed file with 9 additions and 5 deletions.
14 changes: 9 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -28,10 +28,17 @@ install:
nvm use stable
npm install remark-cli remark-lint
fi
echo "the cake is a lie"
if [ "$TRAVIS_OS_NAME" == "windows" ]; then
choco install windows-sdk-10.0
echo "first debug"
(choco install windows-sdk-10.0 -yv) || cat /c/ProgramData/chocolatey/logs/chocolatey.log
echo "second debug"
find tests/ui/* \( -name '*.rs' -or -name '*.stderr' -or -name '*.stdout' \) -exec dos2unix '{}' +
echo "third debug"
find tests/ui-toml/* \( -name '*.rs' -or -name '*.stderr' -or -name '*.stdout' -or -name '*.toml' \) -exec dos2unix '{}' +
fi
fi
echo "end of install step"
# disabling the integration tests in forks should be done with
# if: fork = false
@@ -71,9 +78,6 @@ matrix:
if: repo =~ /^rust-lang\/rust-clippy$/
- env: INTEGRATION=hyperium/hyper
if: repo =~ /^rust-lang\/rust-clippy$/
allow_failures:
- os: windows
env: CARGO_INCREMENTAL=0 BASE_TESTS=true
# prevent these jobs with default env vars
exclude:
- os: linux
@@ -97,7 +101,7 @@ script:
after_success: |
#!/bin/bash
if [ $(uname) == Linux ]; then
if [ "$TRAVIS_OS_NAME" == "linux" ]; then
set -ex
if [ -z ${INTEGRATION} ]; then
./.github/deploy.sh

0 comments on commit ac8868e

Please sign in to comment.