diff options
| author | bors <bors@rust-lang.org> | 2021-07-26 14:42:30 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-07-26 14:42:30 +0000 |
| commit | a178d0322ce20e33eac124758e837cbd80a6f633 (patch) | |
| tree | 049ec0c9a6afed7b3d8e4a87cd7a784621244980 /src/ci | |
| parent | c8fb0b5be2c95d90036d78a4cffa483005c5daee (diff) | |
| parent | 55f9bc09a64e845643572fe31c46e8b14d2edb74 (diff) | |
| download | rust-1.54.0.tar.gz rust-1.54.0.zip | |
Auto merge of #87476 - pietroalbini:stable-next, r=Mark-Simulacrum 1.54.0
Prepare 1.54.0 release This PR builds the stable artifacts for the 1.54.0 release. Backports included: * https://github.com/rust-lang/rust/pull/86696 * #87167 * #87210 I was *not* able to cherry-pick https://github.com/rust-lang/rust/pull/87390 as that didn't apply cleanly to the stable branch. `@GuillaumeGomez` `@notriddle` could it be possible to get a PR targeting `stable` backporting that fix? Also, this **enables** incremental compilation on the stable channel. r? `@Mark-Simulacrum` cc `@rust-lang/release`
Diffstat (limited to 'src/ci')
| -rw-r--r-- | src/ci/channel | 2 | ||||
| -rw-r--r-- | src/ci/docker/host-x86_64/x86_64-gnu-tools/Dockerfile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/ci/channel b/src/ci/channel index 65b2df87f7d..2bf5ad0447d 100644 --- a/src/ci/channel +++ b/src/ci/channel @@ -1 +1 @@ -beta +stable diff --git a/src/ci/docker/host-x86_64/x86_64-gnu-tools/Dockerfile b/src/ci/docker/host-x86_64/x86_64-gnu-tools/Dockerfile index 605d988dad7..ee7c223ba57 100644 --- a/src/ci/docker/host-x86_64/x86_64-gnu-tools/Dockerfile +++ b/src/ci/docker/host-x86_64/x86_64-gnu-tools/Dockerfile @@ -71,7 +71,7 @@ ENV PATH="/node-v14.4.0-linux-x64/bin:${PATH}" # https://github.com/puppeteer/puppeteer/issues/375 # # We also specify the version in case we need to update it to go around cache limitations. -RUN npm install -g browser-ui-test@0.2.12 --unsafe-perm=true +RUN npm install -g browser-ui-test@0.4.2 --unsafe-perm=true ENV RUST_CONFIGURE_ARGS \ --build=x86_64-unknown-linux-gnu \ |