From f8a38140a07a681f2e87bfedd0e48fe18cb6b3e6 Mon Sep 17 00:00:00 2001 From: Oliver Schneider Date: Mon, 19 Mar 2018 10:48:26 +0100 Subject: [PATCH 1/7] Try running appveyor on master instead of nightly --- appveyor.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 32ea8c62a2d..1674932d543 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -17,6 +17,10 @@ install: - 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 + - cargo install rustup-toolchain-install-master || echo "rustup-toolchain-install-master already installed" + - rustup-toolchain-install-master -f -n master + - rustup default master + - set PATH=%PATH%;C:\Users\appveyor\.rustup\toolchains\master\bin - rustc -V - cargo -V From d6af6886e7bbed5cdfb54e7c8a880404f5bc8532 Mon Sep 17 00:00:00 2001 From: Oliver Schneider Date: Fri, 20 Jul 2018 10:33:46 +0200 Subject: [PATCH 2/7] Keep the rustc master install in the travis file so we can use `travis_retry` --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index c6bd67ae0f3..e8a3b9a9c77 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,6 +50,9 @@ matrix: - env: INTEGRATION=hyperium/hyper script: + - cargo install rustup-toolchain-install-master || echo "rustup-toolchain-install-master already installed" + - travis_retry rustup-toolchain-install-master -f -n master + - rustup default master - | if [ -z ${INTEGRATION} ]; then ./ci/base-tests.sh From f969cf2cb665c567fc852244a0e6e12af9020cf5 Mon Sep 17 00:00:00 2001 From: Oliver Schneider Date: Fri, 20 Jul 2018 16:22:28 +0200 Subject: [PATCH 3/7] Remove rust-toolchain file in CI --- .travis.yml | 1 + appveyor.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index e8a3b9a9c77..1e48719b2b6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,6 +50,7 @@ matrix: - env: INTEGRATION=hyperium/hyper script: + - 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 - rustup default master diff --git a/appveyor.yml b/appveyor.yml index 1674932d543..07bbbcab54c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -13,6 +13,7 @@ environment: install: - set PATH=C:\Program Files\Git\mingw64\bin;%PATH% + - del rust-toolchain - 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 From efeed9aefc172315fd840d27514069f7c0d27329 Mon Sep 17 00:00:00 2001 From: flip1995 <9744647+flip1995@users.noreply.github.com> Date: Wed, 22 Aug 2018 17:47:54 +0200 Subject: [PATCH 4/7] Remove unused code --- appveyor.yml | 6 ------ util/dogfood.sh | 5 ----- 2 files changed, 11 deletions(-) delete mode 100755 util/dogfood.sh diff --git a/appveyor.yml b/appveyor.yml index 07bbbcab54c..e43750c30a6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,11 +3,8 @@ 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 @@ -31,9 +28,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 diff --git a/util/dogfood.sh b/util/dogfood.sh deleted file mode 100755 index 358fc46c8db..00000000000 --- a/util/dogfood.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -rm -rf target*/*so -cargo build --lib && cp -R target target_recur && cargo rustc --lib -- -Zextra-plugins=clippy -Ltarget_recur/debug -Dclippy_pedantic -Dclippy || exit 1 -rm -rf target_recur - From 97a9332014ddcebdd1ec60b42b669e101c707985 Mon Sep 17 00:00:00 2001 From: flip1995 <9744647+flip1995@users.noreply.github.com> Date: Wed, 22 Aug 2018 18:07:39 +0200 Subject: [PATCH 5/7] Remove MinGW from CI --- appveyor.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index e43750c30a6..9db787cf41e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -6,15 +6,12 @@ environment: #- TARGET: i686-pc-windows-msvc #- TARGET: x86_64-pc-windows-gnu - TARGET: x86_64-pc-windows-msvc - MSYS2_BITS: 64 install: - - set PATH=C:\Program Files\Git\mingw64\bin;%PATH% - del rust-toolchain - 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 - cargo install rustup-toolchain-install-master || echo "rustup-toolchain-install-master already installed" - rustup-toolchain-install-master -f -n master - rustup default master From 205db6f68600d76a9b81029d9a62e9d0df5c96a3 Mon Sep 17 00:00:00 2001 From: flip1995 <9744647+flip1995@users.noreply.github.com> Date: Wed, 22 Aug 2018 18:08:52 +0200 Subject: [PATCH 6/7] Add LD_LIBRARY_PATH and GITHUB_TOKEN --- .travis.yml | 12 ++++++++---- appveyor.yml | 13 +++++++------ 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1e48719b2b6..08fdf2fb6d8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,10 +50,14 @@ matrix: - env: INTEGRATION=hyperium/hyper script: - - 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 - - rustup default master + - | + 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 diff --git a/appveyor.yml b/appveyor.yml index 9db787cf41e..94f9500ab85 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,14 +8,15 @@ environment: - TARGET: x86_64-pc-windows-msvc install: - - del rust-toolchain - 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 - - cargo install rustup-toolchain-install-master || echo "rustup-toolchain-install-master already installed" - - rustup-toolchain-install-master -f -n master - - rustup default master - - set PATH=%PATH%;C:\Users\appveyor\.rustup\toolchains\master\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 From 273e11fcafa07287c19b28794dfd28ae9b09e7ff Mon Sep 17 00:00:00 2001 From: Philipp Hansch Date: Sun, 2 Sep 2018 11:31:39 +0200 Subject: [PATCH 7/7] Trigger rebuild for AppVeyor (and fix grammar) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 98f712c28d8..69dba57f460 100644 --- a/README.md +++ b/README.md @@ -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"]