Skip to content

Commit 2d0b7db

Browse files
authored
Merge pull request #3115 from rust-lang-nursery/rm-token
Remove dependence of ci on github token
2 parents 1d13c1f + 79d81ac commit 2d0b7db

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

.travis.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,12 @@ matrix:
5151

5252
script:
5353
- |
54-
if [ -n "$GITHUB_TOKEN" ]; then
5554
rm rust-toolchain
5655
cargo install rustup-toolchain-install-master || echo "rustup-toolchain-install-master already installed"
57-
travis_retry rustup-toolchain-install-master -f -n master --github-token $GITHUB_TOKEN
56+
RUSTC_HASH=$(git ls-remote https://github.com/rust-lang/rust.git master | awk '{print $1}')
57+
travis_retry rustup-toolchain-install-master -f -n master $RUSTC_HASH
5858
rustup default master
5959
export LD_LIBRARY_PATH=$(rustc --print sysroot)/lib
60-
fi
6160
- |
6261
if [ -z ${INTEGRATION} ]; then
6362
./ci/base-tests.sh

appveyor.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,13 @@ install:
1111
- curl -sSf -o rustup-init.exe https://win.rustup.rs/
1212
- rustup-init.exe -y --default-host %TARGET% --default-toolchain nightly
1313
- set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
14-
# https://support.microsoft.com/en-us/help/2524009/error-running-command-shell-scripts-that-include-parentheses
15-
- if defined GITHUB_TOKEN del rust-toolchain
16-
- if defined GITHUB_TOKEN (cargo install rustup-toolchain-install-master || echo "rustup-toolchain-install-master already installed")
17-
- if defined GITHUB_TOKEN rustup-toolchain-install-master -f -n master --github-token %GITHUB_TOKEN%
18-
- if defined GITHUB_TOKEN rustup default master
19-
- if defined GITHUB_TOKEN set PATH=%PATH%;C:\Users\appveyor\.rustup\toolchains\master\bin
14+
- git ls-remote https://github.com/rust-lang/rust.git master | awk '{print $1}' >rustc-hash.txt
15+
- set /p RUSTC_HASH=<rustc-hash.txt
16+
- del rust-toolchain
17+
- cargo install rustup-toolchain-install-master || echo "rustup-toolchain-install-master already installed"
18+
- rustup-toolchain-install-master %RUSTC_HASH% -f -n master
19+
- rustup default master
20+
- set PATH=%PATH%;C:\Users\appveyor\.rustup\toolchains\master\bin
2021
- rustc -V
2122
- cargo -V
2223

0 commit comments

Comments
 (0)