about summary refs log tree commit diff
diff options
context:
space:
mode:
authorflip1995 <hello@philkrones.com>2020-02-12 17:16:39 +0100
committerflip1995 <hello@philkrones.com>2020-02-18 10:08:58 +0100
commit6835e2d8e0983bd84fbd3795be34eb49118cca42 (patch)
tree985bf950c53f1de2c1e8618b6171df2e41822b86
parent0da4dd009ec28fb0e48bd10613dfb0ed5912d488 (diff)
downloadrust-6835e2d8e0983bd84fbd3795be34eb49118cca42.tar.gz
rust-6835e2d8e0983bd84fbd3795be34eb49118cca42.zip
Nuke Travis+AppVeyor CI
-rw-r--r--.github/deploy_key.encbin1680 -> 0 bytes
-rw-r--r--.travis.yml154
-rw-r--r--Cargo.toml4
-rw-r--r--README.md2
-rw-r--r--appveyor.yml47
-rwxr-xr-xci/base-tests.sh55
6 files changed, 1 insertions, 261 deletions
diff --git a/.github/deploy_key.enc b/.github/deploy_key.enc
deleted file mode 100644
index 48cb3f5a127..00000000000
--- a/.github/deploy_key.enc
+++ /dev/null
Binary files differdiff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index fa02f533401..00000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,154 +0,0 @@
-dist: xenial
-language: bash
-git:
-  depth: 1
-  quiet: true
-
-branches:
-  # Don't build these branches
-  except:
-    # Used by bors
-    - trying.tmp
-    - staging.tmp
-
-cache:
-  directories:
-    - $HOME/.cargo
-before_cache:
-  - cargo install cargo-cache --debug
-  - find $HOME/.cargo/bin/ ! -type d -exec strip {} \;
-  - cargo cache --autoclean
-
-env:
-  global:
-    - RUST_BACKTRACE=1
-    - secure: "OKulfkA5OGd/d1IhvBKzRkHQwMcWjzrzbimo7+5NhkUkWxndAzl+719TB3wWvIh1i2wXXrEXsyZkXM5FtRrHm55v1VKQ5ibjEvFg1w3NIg81iDyoLq186fLqywvxGkOAFPrsePPsBj5USd5xvhwwbrjO6L7/RK6Z8shBwOSc41s="
-
-before_install:
-  - export CARGO_TARGET_DIR="$TRAVIS_BUILD_DIR/target"
-  - |
-    case "$TRAVIS_OS_NAME" in
-      linux ) HOST=x86_64-unknown-linux-gnu;;
-      osx ) HOST=x86_64-apple-darwin;;
-      windows ) HOST=x86_64-pc-windows-msvc;;
-    esac
-  - curl -sSL https://sh.rustup.rs | sh -s -- -y --default-host="$HOST" --default-toolchain=nightly --profile=minimal
-  - export PATH="$HOME/.cargo/bin:$PATH"
-install:
-  - |
-    if [[ -z ${INTEGRATION} ]]; then
-      if ! rustup component add rustfmt; then
-        TARGET=$(rustc -Vv | awk '/host/{print $2}')
-        NIGHTLY=$(curl -s "https://rust-lang.github.io/rustup-components-history/${TARGET}/rustfmt")
-        curl -sSL "https://static.rust-lang.org/dist/${NIGHTLY}/rustfmt-nightly-${TARGET}.tar.xz" | \
-        tar -xJf - --strip-components=3 -C ~/.cargo/bin
-        rm -rf ~/.cargo/bin/doc
-      fi
-      if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-        . $HOME/.nvm/nvm.sh
-        nvm install stable
-        nvm use stable
-        npm install remark-cli remark-lint remark-lint-maximum-line-length remark-preset-lint-recommended
-      elif [[ "$TRAVIS_OS_NAME" == "windows" ]]; then
-        choco install windows-sdk-10.1
-      fi
-    fi
-
-# disabling the integration tests in forks should be done with
-# if: fork = false
-# but this is currently buggy travis-ci/travis-ci#9118
-matrix:
-  fast_finish: true
-  include:
-    # Builds that are executed for every PR
-    - os: linux
-    # i686 toolchain could run on x86_64 system.
-    - os: linux
-      env: HOST_TOOLCHAIN=i686-unknown-linux-gnu
-      addons:
-        apt:
-          packages:
-            - gcc-multilib
-            - libssl-dev:i386     # openssl dev in Cargo.toml
-      if: branch IN (auto, try)
-    - os: windows
-      env: CARGO_INCREMENTAL=0 OS_WINDOWS=true
-
-    # Builds that are only executed when a PR is r+ed or a try build is started
-    # We don't want to run these always because they go towards
-    # the build limit within the Travis rust-lang account.
-    # The jobs are approximately sorted by execution time
-    - os: osx
-      if: branch IN (auto, try)
-    - env: INTEGRATION=rust-lang/rls
-      if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
-    - env: INTEGRATION=rust-lang/cargo
-      if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
-    - env: INTEGRATION=rust-lang/chalk
-      if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
-    - env: INTEGRATION=Geal/nom
-      if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
-    - env: INTEGRATION=rust-lang/rustfmt
-      if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
-    - env: INTEGRATION=hyperium/hyper
-      if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
-    - env: INTEGRATION=rust-itertools/itertools
-      if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
-    # FIXME: rustc ICE on `serde_test_suite`
-    # - env: INTEGRATION=serde-rs/serde
-    #   if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
-    - env: INTEGRATION=rust-lang/stdarch
-      if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
-    - env: INTEGRATION=rust-random/rand
-      if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
-    - env: INTEGRATION=rust-lang/futures-rs
-      if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
-    - env: INTEGRATION=Marwes/combine
-      if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
-    - env: INTEGRATION=rust-lang-nursery/failure
-      if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
-    - env: INTEGRATION=rust-lang/log
-      if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
-    - env: INTEGRATION=chronotope/chrono
-      if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
-  allow_failures:
-    - os: windows
-      env: CARGO_INCREMENTAL=0 OS_WINDOWS=true
-
-before_script:
-  - |
-    if [[ "$TRAVIS_BRANCH" == "auto" ]] || [[ "$TRAVIS_BRANCH" == "try" ]]; then
-      PR=$(echo "$TRAVIS_COMMIT_MESSAGE" | grep -o "#[0-9]*" | head -1 | sed 's/^#//g')
-      output=$(curl -H "Authorization: token $GITHUB_API_TOKEN" -s "https://api.github.com/repos/rust-lang/rust-clippy/pulls/$PR" | \
-        python -c "import sys, json; print(json.load(sys.stdin)['body'])" | \
-        grep "^changelog: " | \
-        sed "s/changelog: //g")
-      if [[ -z "$output" ]]; then
-        echo "ERROR: PR body must contain 'changelog: ...'"
-        exit 1
-      elif [[ "$output" = "none" ]]; then
-        echo "WARNING: changelog is 'none'"
-      fi
-    fi
-  - |
-    rm rust-toolchain
-    ./setup-toolchain.sh
-  - |
-    SYSROOT=$(rustc --print sysroot)
-    case "$TRAVIS_OS_NAME" in
-      windows ) export PATH="${SYSROOT}/bin:${PATH}" ;;
-      linux ) export LD_LIBRARY_PATH="${SYSROOT}/lib${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}" ;;
-      osx )
-        # See <https://github.com/nteract/nteract/issues/1523#issuecomment-301623519>
-        sudo mkdir -p /usr/local/lib
-        sudo find "$SYSROOT/lib" -maxdepth 1 -name '*.dylib' -exec ln -s {} /usr/local/lib \;
-        ;;
-    esac
-
-script:
-  - |
-    if [[ -n ${INTEGRATION} ]]; then
-      cargo test --test integration --features integration && sleep 5
-    else
-      ./ci/base-tests.sh && sleep 5
-    fi
diff --git a/Cargo.toml b/Cargo.toml
index aefbcec15f5..c1a410cf5c8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -18,9 +18,7 @@ build = "build.rs"
 edition = "2018"
 publish = false
 
-[badges]
-travis-ci = { repository = "rust-lang/rust-clippy" }
-appveyor = { repository = "rust-lang/rust-clippy" }
+# [badges]
 # FIXME(flip1995): Add GHA badge once rust-lang/crates.io#1838 is merged
 
 [[bin]]
diff --git a/README.md b/README.md
index 39cc9310f51..628133a8a66 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,5 @@
 # Clippy
 
-[![Build Status](https://travis-ci.com/rust-lang/rust-clippy.svg?branch=master)](https://travis-ci.com/rust-lang/rust-clippy)
-[![Windows Build status](https://ci.appveyor.com/api/projects/status/id677xpw1dguo7iw?svg=true)](https://ci.appveyor.com/project/rust-lang-libs/rust-clippy)
 [![Clippy Test](https://github.com/rust-lang/rust-clippy/workflows/Clippy%20Test/badge.svg?branch=auto&event=push)](https://github.com/rust-lang/rust-clippy/actions?query=workflow%3A%22Clippy+Test%22+event%3Apush+branch%3Aauto)
 [![License: MIT OR Apache-2.0](https://img.shields.io/crates/l/clippy.svg)](#license)
 
diff --git a/appveyor.yml b/appveyor.yml
deleted file mode 100644
index bf6133e98a0..00000000000
--- a/appveyor.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-environment:
-  global:
-    PROJECT_NAME: rust-clippy
-    RUST_BACKTRACE: 1
-  matrix:
-    #- TARGET: i686-pc-windows-gnu
-    #- TARGET: i686-pc-windows-msvc
-    #- TARGET: x86_64-pc-windows-gnu
-    - TARGET: x86_64-pc-windows-msvc
-
-branches:
-  # Only build AppVeyor on r+ and try branch
-  only:
-    - auto
-    - try
-
-cache:
-  - '%USERPROFILE%\.cargo'
-# before cache
-after_test:
-  - cargo install cargo-cache --debug
-  - cargo cache --autoclean
-
-install:
-  - curl -sSf -o rustup-init.exe https://win.rustup.rs/
-  - rustup-init.exe -y --default-host %TARGET% --default-toolchain nightly --profile=minimal
-  - set PATH=%USERPROFILE%\.cargo\bin;%PATH%
-  - rustup component add rustfmt --toolchain nightly & exit 0 # Format test handles missing rustfmt
-  - del rust-toolchain
-  - cargo install rustup-toolchain-install-master
-  - rustup-toolchain-install-master -f -n master -c rustc-dev
-  - rustup override set master
-  - rustc -V
-  - cargo -V
-
-# Build settings, not to be confused with "before_build" and "after_build".
-build: false
-
-build_script:
-  - cargo build --features deny-warnings
-
-test_script:
-  - cargo test --features deny-warnings
-
-notifications:
-  - provider: Email
-    on_build_success: false
diff --git a/ci/base-tests.sh b/ci/base-tests.sh
deleted file mode 100755
index 125a566271d..00000000000
--- a/ci/base-tests.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/usr/bin/env bash
-set -ex
-
-echo "Running clippy base tests"
-
-PATH=$PATH:./node_modules/.bin
-if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-  remark -f ./*.md -f doc/*.md > /dev/null
-fi
-# build clippy in debug mode and run tests
-cargo build --features deny-warnings
-cargo test --features deny-warnings
-
-(cd clippy_lints && cargo test --features deny-warnings)
-(cd rustc_tools_util && cargo test --features deny-warnings)
-(cd clippy_dev && cargo test --features deny-warnings)
-
-# make sure clippy can be called via ./path/to/cargo-clippy
-(
-  cd clippy_workspace_tests
-  ../target/debug/cargo-clippy
-)
-
-# Perform various checks for lint registration
-cargo dev update_lints --check
-cargo dev --limit-stderr-length
-
-# Check running clippy-driver without cargo
-(
-  # Check sysroot handling
-  sysroot=$(./target/debug/clippy-driver --print sysroot)
-  test "$sysroot" = "$(rustc --print sysroot)"
-
-  if [[ -z "$OS_WINDOWS" ]]; then
-    desired_sysroot=/tmp
-  else
-    desired_sysroot=C:/tmp
-  fi
-  sysroot=$(./target/debug/clippy-driver --sysroot $desired_sysroot --print sysroot)
-  test "$sysroot" = $desired_sysroot
-
-  sysroot=$(SYSROOT=$desired_sysroot ./target/debug/clippy-driver --print sysroot)
-  test "$sysroot" = $desired_sysroot
-
-  # Make sure this isn't set - clippy-driver should cope without it
-  unset CARGO_MANIFEST_DIR
-
-  # Run a lint and make sure it produces the expected output. It's also expected to exit with code 1
-  # FIXME: How to match the clippy invocation in compile-test.rs?
-  ./target/debug/clippy-driver -Dwarnings -Aunused -Zui-testing --emit metadata --crate-type bin tests/ui/cstring.rs 2> cstring.stderr && exit 1
-  sed -e 's,tests/ui,$DIR,' -e '/= help/d' cstring.stderr > normalized.stderr
-  diff normalized.stderr tests/ui/cstring.stderr
-
-  # TODO: CLIPPY_CONF_DIR / CARGO_MANIFEST_DIR
-)