Skip to content

Commit

Permalink
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
  • Loading branch information
bors committed Jul 12, 2019
2 parents b029042 + 2ccf515 commit ea12fb0
Showing 1 changed file with 14 additions and 6 deletions.
20 changes: 14 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -81,9 +88,6 @@ matrix:
if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
- env: INTEGRATION=chronotope/chrono
if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
allow_failures:
- os: windows
env: CARGO_INCREMENTAL=0 BASE_TESTS=true
# prevent these jobs with default env vars
exclude:
- os: linux
Expand All @@ -94,7 +98,11 @@ script:
- |
rm rust-toolchain
./setup-toolchain.sh
export LD_LIBRARY_PATH=$(rustc --print sysroot)/lib
if [ "$TRAVIS_OS_NAME" == "windows" ]; then
export PATH=$PATH:$(rustc --print sysroot)/bin
else
export LD_LIBRARY_PATH=$(rustc --print sysroot)/lib
fi
- |
if [ -z ${INTEGRATION} ]; then
travis_wait 30 ./ci/base-tests.sh && sleep 5
Expand All @@ -104,7 +112,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
Expand Down

0 comments on commit ea12fb0

Please sign in to comment.