diff options
| author | bors <bors@rust-lang.org> | 2023-01-31 11:33:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-01-31 11:33:43 +0000 |
| commit | 0aaa9ea5c05519f8e4676333cade3183b60fcc87 (patch) | |
| tree | 34763881e535998c36985e301865ef1aeb9dbf23 /src/ci/docker | |
| parent | e57962f4f1a5424ca8dc5eaebc4d0d93b7194c22 (diff) | |
| parent | a78e178b659dc1cf29b0482c97006f2e84af8419 (diff) | |
| download | rust-0aaa9ea5c05519f8e4676333cade3183b60fcc87.tar.gz rust-0aaa9ea5c05519f8e4676333cade3183b60fcc87.zip | |
Auto merge of #2772 - RalfJung:rustup, r=RalfJung
Rustup
Diffstat (limited to 'src/ci/docker')
| -rw-r--r-- | src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile | 2 | ||||
| -rwxr-xr-x | src/ci/docker/host-x86_64/mingw-check/validate-toolstate.sh | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile b/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile index 6bdc88e18f5..5feba4e0605 100644 --- a/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile +++ b/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile @@ -81,7 +81,7 @@ ENV RUST_CONFIGURE_ARGS \ --set rust.jemalloc \ --set rust.use-lld=true \ --set rust.lto=thin -ENV SCRIPT ../src/ci/pgo.sh python3 ../x.py dist \ +ENV SCRIPT python3 ../src/ci/stage-build.py python3 ../x.py dist \ --host $HOSTS --target $HOSTS \ --include-default-paths \ build-manifest bootstrap diff --git a/src/ci/docker/host-x86_64/mingw-check/validate-toolstate.sh b/src/ci/docker/host-x86_64/mingw-check/validate-toolstate.sh index c6d728eb80d..0b06f5e3623 100755 --- a/src/ci/docker/host-x86_64/mingw-check/validate-toolstate.sh +++ b/src/ci/docker/host-x86_64/mingw-check/validate-toolstate.sh @@ -9,11 +9,5 @@ git clone --depth=1 https://github.com/rust-lang-nursery/rust-toolstate.git cd rust-toolstate python3 "../../src/tools/publish_toolstate.py" "$(git rev-parse HEAD)" \ "$(git log --format=%s -n1 HEAD)" "" "" -# Only check maintainers if this build is supposed to publish toolstate. -# Builds that are not supposed to publish don't have the access token. -if [ -n "${TOOLSTATE_PUBLISH+is_set}" ]; then - TOOLSTATE_VALIDATE_MAINTAINERS_REPO=rust-lang/rust python3 \ - "../../src/tools/publish_toolstate.py" -fi cd .. rm -rf rust-toolstate |