Skip to content

build: use my RTIM branch because old commit is force-pushed #4667

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 21 additions & 18 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ matrix:
- os: osx
- os: windows

script:
before_script:
- |
if [ "$TRAVIS_BRANCH" == "auto" ] || [ "$TRAVIS_BRANCH" == "try" ]; then
pr=$(echo $TRAVIS_COMMIT_MESSAGE | grep -o "#[0-9]*" | head -1 | sed 's/^#//g')
Expand All @@ -107,28 +107,31 @@ script:
fi
fi
- |
rm rust-toolchain
./setup-toolchain.sh
if [ "$TRAVIS_OS_NAME" == "windows" ]; then
export PATH=$PATH:$(rustc --print sysroot)/bin
else
export LD_LIBRARY_PATH=$(rustc --print sysroot)/lib
fi
rm rust-toolchain
./setup-toolchain.sh
- |
if [ "$TRAVIS_OS_NAME" == "windows" ]; then
export PATH=$PATH:$(rustc --print sysroot)/bin
else
export LD_LIBRARY_PATH=$(rustc --print sysroot)/lib
fi

script:
- |
if [ -z ${INTEGRATION} ]; then
travis_wait 30 ./ci/base-tests.sh && sleep 5
else
./ci/integration-tests.sh && sleep 5
fi

after_success: |
#!/bin/bash
if [ "$TRAVIS_OS_NAME" == "linux" ]; then
set -ex
if [ -z ${INTEGRATION} ]; then
./.github/deploy.sh
else
echo "Not deploying, because we're in an integration test run"
after_success:
- |
if [ "$TRAVIS_OS_NAME" == "linux" ]; then
set -e
if [ -z ${INTEGRATION} ]; then
./.github/deploy.sh
else
echo "Not deploying, because we're in an integration test run"
fi
set +e
fi
set +e
fi
4 changes: 3 additions & 1 deletion setup-toolchain.sh
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
#!/bin/bash
# Set up the appropriate rustc toolchain

set -e

cd "$(dirname "$0")" || exit

if ! command -v rustup-toolchain-install-master > /dev/null; then
cargo install \
--git https://github.com/lzutao/rustup-toolchain-install-master \
--rev c44dbf920b644000ac3ba01184cbb1a01bb91519 \
--branch ci-more-oses \
--bin rustup-toolchain-install-master \
--debug
fi
Expand Down