diff options
| author | kennytm <kennytm@gmail.com> | 2018-07-17 18:15:37 +0800 |
|---|---|---|
| committer | kennytm <kennytm@gmail.com> | 2018-07-17 19:24:55 +0800 |
| commit | c052a491f15c917bd8a7b65983ecb422ef529ea4 (patch) | |
| tree | 5cd1caa1e442b7bae53715eeb6599b3be2726cd6 | |
| parent | 9ea0a8533e4e1708a4f412895ab51a4cb69492a4 (diff) | |
| parent | a9bcbb27b8d0cc3331ada98bc8cadcbb4073ff10 (diff) | |
| download | rust-c052a491f15c917bd8a7b65983ecb422ef529ea4.tar.gz rust-c052a491f15c917bd8a7b65983ecb422ef529ea4.zip | |
Rollup merge of #52446 - kennytm:block-beta-on-clippy, r=nrc
Block beta if clippy breaks. Also, don't fail master pull request when an unrelated tool is not test-pass.
| -rwxr-xr-x | src/ci/docker/x86_64-gnu-tools/checktools.sh | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/ci/docker/x86_64-gnu-tools/checktools.sh b/src/ci/docker/x86_64-gnu-tools/checktools.sh index e8197e90851..f6d375058a7 100755 --- a/src/ci/docker/x86_64-gnu-tools/checktools.sh +++ b/src/ci/docker/x86_64-gnu-tools/checktools.sh @@ -81,8 +81,8 @@ status_check() { check_dispatch $1 beta rust-by-example src/doc/rust-by-example check_dispatch $1 beta rls src/tools/rls check_dispatch $1 beta rustfmt src/tools/rustfmt + check_dispatch $1 beta clippy-driver src/tools/clippy # these tools are not required for beta to successfully branch - check_dispatch $1 nightly clippy-driver src/tools/clippy check_dispatch $1 nightly miri src/tools/miri } @@ -106,12 +106,14 @@ $COMMIT\t$(cat "$TOOLSTATE_FILE") fi } -if [ "$RUST_RELEASE_CHANNEL" = nightly -a -n "${TOOLSTATE_REPO_ACCESS_TOKEN+is_set}" ]; then - . "$(dirname $0)/repo.sh" - MESSAGE_FILE=$(mktemp -t msg.XXXXXX) - echo "($OS CI update)" > "$MESSAGE_FILE" - commit_toolstate_change "$MESSAGE_FILE" change_toolstate - rm -f "$MESSAGE_FILE" +if [ "$RUST_RELEASE_CHANNEL" = nightly ]; then + if [ -n "${TOOLSTATE_REPO_ACCESS_TOKEN+is_set}" ]; then + . "$(dirname $0)/repo.sh" + MESSAGE_FILE=$(mktemp -t msg.XXXXXX) + echo "($OS CI update)" > "$MESSAGE_FILE" + commit_toolstate_change "$MESSAGE_FILE" change_toolstate + rm -f "$MESSAGE_FILE" + fi exit 0 fi |