Skip to content

Run travis on rustc-master instead of nightly #2941

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

Merged
merged 8 commits into from
Sep 3, 2018
Merged
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
8 changes: 8 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,14 @@ matrix:
- env: INTEGRATION=hyperium/hyper

script:
- |
if [ -n "$GITHUB_TOKEN" ]; then
rm rust-toolchain
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
./ci/base-tests.sh
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ Be sure that Clippy was compiled with the same version of rustc that cargo invok

## Configuration

Some lints can be configured in a TOML file named with `clippy.toml` or `.clippy.toml`. It contains basic `variable = value` mapping eg.
Some lints can be configured in a TOML file named `clippy.toml` or `.clippy.toml`. It contains a basic `variable = value` mapping eg.

```toml
blacklisted-names = ["toto", "tata", "titi"]
Expand Down
17 changes: 7 additions & 10 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@ environment:
PROJECT_NAME: rust-clippy
matrix:
#- TARGET: i686-pc-windows-gnu
# MSYS2_BITS: 32
#- TARGET: i686-pc-windows-msvc
# MSYS2_BITS: 32
#- TARGET: x86_64-pc-windows-gnu
# MSYS2_BITS: 64
- TARGET: x86_64-pc-windows-msvc
MSYS2_BITS: 64

install:
- set PATH=C:\Program Files\Git\mingw64\bin;%PATH%
- curl -sSf -o rustup-init.exe https://win.rustup.rs/
- 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
- if defined MSYS2_BITS set PATH=%PATH%;C:\msys64\mingw%MSYS2_BITS%\bin
- set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
# https://support.microsoft.com/en-us/help/2524009/error-running-command-shell-scripts-that-include-parentheses
- if defined GITHUB_TOKEN del rust-toolchain
- if defined GITHUB_TOKEN (cargo install rustup-toolchain-install-master || echo "rustup-toolchain-install-master already installed")
- 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
- cargo -V

Expand All @@ -26,9 +26,6 @@ test_script:
- set RUST_BACKTRACE=1
- cargo build --features debugging
- cargo test --features debugging
#- copy target\debug\cargo-clippy.exe C:\Users\appveyor\.cargo\bin\
#- cargo clippy -- -D clippy
#- cd clippy_lints && cargo clippy -- -D clippy && cd ..

notifications:
- provider: Email
Expand Down
5 changes: 0 additions & 5 deletions util/dogfood.sh

This file was deleted.