mirror of
https://github.com/rust-lang/rust.git
synced 2025-06-05 03:38:29 +00:00
Add LD_LIBRARY_PATH and GITHUB_TOKEN
This commit is contained in:
parent
97a9332014
commit
205db6f686
12
.travis.yml
12
.travis.yml
@ -50,10 +50,14 @@ matrix:
|
|||||||
- env: INTEGRATION=hyperium/hyper
|
- env: INTEGRATION=hyperium/hyper
|
||||||
|
|
||||||
script:
|
script:
|
||||||
- rm rust-toolchain
|
- |
|
||||||
- cargo install rustup-toolchain-install-master || echo "rustup-toolchain-install-master already installed"
|
if [ -n "$GITHUB_TOKEN" ]; then
|
||||||
- travis_retry rustup-toolchain-install-master -f -n master
|
rm rust-toolchain
|
||||||
- rustup default master
|
cargo install rustup-toolchain-install-master || echo "rustup-toolchain-install-master already installed"
|
||||||
|
travis_retry rustup-toolchain-install-master -f -n master --github-token $GITHUB_TOKEN
|
||||||
|
rustup default master
|
||||||
|
export LD_LIBRARY_PATH=$(rustc --print sysroot)/lib
|
||||||
|
fi
|
||||||
- |
|
- |
|
||||||
if [ -z ${INTEGRATION} ]; then
|
if [ -z ${INTEGRATION} ]; then
|
||||||
./ci/base-tests.sh
|
./ci/base-tests.sh
|
||||||
|
13
appveyor.yml
13
appveyor.yml
@ -8,14 +8,15 @@ environment:
|
|||||||
- TARGET: x86_64-pc-windows-msvc
|
- TARGET: x86_64-pc-windows-msvc
|
||||||
|
|
||||||
install:
|
install:
|
||||||
- del rust-toolchain
|
|
||||||
- curl -sSf -o rustup-init.exe https://win.rustup.rs/
|
- curl -sSf -o rustup-init.exe https://win.rustup.rs/
|
||||||
- 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;C:\Users\appveyor\.rustup\toolchains\nightly-%TARGET%\bin
|
- set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
|
||||||
- cargo install rustup-toolchain-install-master || echo "rustup-toolchain-install-master already installed"
|
# https://support.microsoft.com/en-us/help/2524009/error-running-command-shell-scripts-that-include-parentheses
|
||||||
- rustup-toolchain-install-master -f -n master
|
- if defined GITHUB_TOKEN del rust-toolchain
|
||||||
- rustup default master
|
- if defined GITHUB_TOKEN (cargo install rustup-toolchain-install-master || echo "rustup-toolchain-install-master already installed")
|
||||||
- set PATH=%PATH%;C:\Users\appveyor\.rustup\toolchains\master\bin
|
- if defined GITHUB_TOKEN rustup-toolchain-install-master -f -n master --github-token %GITHUB_TOKEN%
|
||||||
|
- if defined GITHUB_TOKEN rustup default master
|
||||||
|
- if defined GITHUB_TOKEN set PATH=%PATH%;C:\Users\appveyor\.rustup\toolchains\master\bin
|
||||||
- rustc -V
|
- rustc -V
|
||||||
- cargo -V
|
- cargo -V
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user