rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Auto merge of #4668 - lzutao:update-rtim, r=flip1995

Browse Source 
build: switch back to latest official RTIM release

Closes #4666

changelog: none
This commit is contained in:
bors
2019-10-15 18:34:30 +00:00
parent 778ace37e5 0b39946b20
commit ddb5cb787d
3 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
.travis.yml
View File

@@ -91,7 +91,7 @@ matrix:
- os: osx - os: osx
- os: windows - os: windows
script: before_script:
- | - |
if [ "$TRAVIS_BRANCH" == "auto" ] || [ "$TRAVIS_BRANCH" == "try" ]; then if [ "$TRAVIS_BRANCH" == "auto" ] || [ "$TRAVIS_BRANCH" == "try" ]; then
pr=$(echo $TRAVIS_COMMIT_MESSAGE | grep -o "#[0-9]*" | head -1 | sed 's/^#//g') pr=$(echo $TRAVIS_COMMIT_MESSAGE | grep -o "#[0-9]*" | head -1 | sed 's/^#//g')
@@ -107,13 +107,16 @@ script:
fi fi
fi fi
- | - |
rm rust-toolchain rm rust-toolchain
./setup-toolchain.sh ./setup-toolchain.sh
if [ "$TRAVIS_OS_NAME" == "windows" ]; then - |
export PATH=$PATH:$(rustc --print sysroot)/bin if [ "$TRAVIS_OS_NAME" == "windows" ]; then
else export PATH=$PATH:$(rustc --print sysroot)/bin
export LD_LIBRARY_PATH=$(rustc --print sysroot)/lib else
fi export LD_LIBRARY_PATH=$(rustc --print sysroot)/lib
fi
script:
- | - |
if [ -z ${INTEGRATION} ]; then if [ -z ${INTEGRATION} ]; then
travis_wait 30 ./ci/base-tests.sh && sleep 5 travis_wait 30 ./ci/base-tests.sh && sleep 5
@@ -121,14 +124,14 @@ script:
./ci/integration-tests.sh && sleep 5 ./ci/integration-tests.sh && sleep 5
fi fi
after_success: | after_success:
#!/bin/bash - |
if [ "$TRAVIS_OS_NAME" == "linux" ]; then if [ "$TRAVIS_OS_NAME" == "linux" ]; then
set -ex set -e
if [ -z ${INTEGRATION} ]; then if [ -z ${INTEGRATION} ]; then
./.github/deploy.sh ./.github/deploy.sh
else else
echo "Not deploying, because we're in an integration test run" echo "Not deploying, because we're in an integration test run"
fi
set +e
fi fi
set +e
fi

2
appveyor.yml
View File

@@ -18,7 +18,7 @@ install:
- rustup-init.exe -y --default-host %TARGET% --default-toolchain nightly - rustup-init.exe -y --default-host %TARGET% --default-toolchain nightly
- set PATH=%PATH%;C:\Users\appveyor\.cargo\bin - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
- del rust-toolchain - del rust-toolchain
- cargo install --git https://github.com/kennytm/rustup-toolchain-install-master --debug || echo "rustup-toolchain-install-master already installed" - cargo install rustup-toolchain-install-master --debug || echo "rustup-toolchain-install-master already installed"
- rustup-toolchain-install-master -f -n master - rustup-toolchain-install-master -f -n master
- rustup component add rustfmt --toolchain nightly & exit 0 # Format test handles missing rustfmt - rustup component add rustfmt --toolchain nightly & exit 0 # Format test handles missing rustfmt
- rustup default master - rustup default master

5
setup-toolchain.sh
View File

@@ -1,12 +1,13 @@
#!/bin/bash #!/bin/bash
# Set up the appropriate rustc toolchain # Set up the appropriate rustc toolchain
set -e
cd "$(dirname "$0")" || exit cd "$(dirname "$0")" || exit
if ! command -v rustup-toolchain-install-master > /dev/null; then if ! command -v rustup-toolchain-install-master > /dev/null; then
cargo install \ cargo install \
--git https://github.com/lzutao/rustup-toolchain-install-master \ rustup-toolchain-install-master \
--rev c44dbf920b644000ac3ba01184cbb1a01bb91519 \
--bin rustup-toolchain-install-master \ --bin rustup-toolchain-install-master \
--debug --debug
fi fi