diff options
| author | Pietro Albini <pietro@pietroalbini.org> | 2018-07-03 11:31:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-03 11:31:12 +0200 |
| commit | 6af4397e191d99367aa12b87dc87bf2e565d87a0 (patch) | |
| tree | 3086ee509c1cba3ced357f08bbb7febd2f19d275 /src/ci/docker | |
| parent | 5feb26cc554ba723e5e052f5e3bfa3f9308cce88 (diff) | |
| parent | 689cffa211e4c2c2c74dbc759020be40fe222d23 (diff) | |
| download | rust-6af4397e191d99367aa12b87dc87bf2e565d87a0.tar.gz rust-6af4397e191d99367aa12b87dc87bf2e565d87a0.zip | |
Rollup merge of #52004 - kennytm:toolstate-fixes, r=Mark-Simulacrum
toolstate: Fixed detection of changed submodule, and other fixes. 1. Make sure that if a submodule is updated but failed to test-pass, we'll block the merge. 2. Make sure failure on external docs (nomicon/RBE/etc) are properly checked. 3. If the commit message starts with "Update RLS" (or clippy etc), automatically run the "tools" job on the PR, so that we could know if the update failed before merging.
Diffstat (limited to 'src/ci/docker')
| -rwxr-xr-x | src/ci/docker/x86_64-gnu-tools/checktools.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ci/docker/x86_64-gnu-tools/checktools.sh b/src/ci/docker/x86_64-gnu-tools/checktools.sh index 56e637249f5..e8197e90851 100755 --- a/src/ci/docker/x86_64-gnu-tools/checktools.sh +++ b/src/ci/docker/x86_64-gnu-tools/checktools.sh @@ -79,11 +79,11 @@ status_check() { check_dispatch $1 beta nomicon src/doc/nomicon check_dispatch $1 beta reference src/doc/reference check_dispatch $1 beta rust-by-example src/doc/rust-by-example - check_dispatch $1 beta rls src/tool/rls - check_dispatch $1 beta rustfmt src/tool/rustfmt + check_dispatch $1 beta rls src/tools/rls + check_dispatch $1 beta rustfmt src/tools/rustfmt # these tools are not required for beta to successfully branch - check_dispatch $1 nightly clippy-driver src/tool/clippy - check_dispatch $1 nightly miri src/tool/miri + check_dispatch $1 nightly clippy-driver src/tools/clippy + check_dispatch $1 nightly miri src/tools/miri } # If this PR is intended to update one of these tools, do not let the build pass |