about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPietro Albini <pietro@pietroalbini.org>2019-08-01 16:00:34 +0200
committerGitHub <noreply@github.com>2019-08-01 16:00:34 +0200
commitb1d5e52840f05e846a56023d2ec68bf700274552 (patch)
treea3bcfeae70d10a2f18cf1a2b3409a02dec05aa3d
parentaa15dadd15d4f908b37bd5495ca8ebe74358414d (diff)
parent8f8b3f26c2aac88b8d9ad4a43124142724f29df0 (diff)
downloadrust-b1d5e52840f05e846a56023d2ec68bf700274552.tar.gz
rust-b1d5e52840f05e846a56023d2ec68bf700274552.zip
Rollup merge of #63191 - pietroalbini:really-fix-toolstate, r=alexcrichton
ci: fix toolstate not pushing data for Linux

A recent commit modified toolstate to only push updated data when the `TOOLSTATE_PUBLISH` environment variable is present. This worked fine on Windows but failed on Linux, since Linux jobs run inside Docker containers and the variable wasn't forwarded inside it.

This changes the Docker startup code to set the `TOOLSTATE_PUBLISH` enviornment variable inside the container if it's present outside.

r? @alexcrichton
fixes https://github.com/rust-lang/rust/issues/63190
-rwxr-xr-xsrc/ci/docker/run.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/ci/docker/run.sh b/src/ci/docker/run.sh
index 7d3f013ea01..415d6b63eb8 100755
--- a/src/ci/docker/run.sh
+++ b/src/ci/docker/run.sh
@@ -172,6 +172,7 @@ docker \
   --env BUILD_SOURCEBRANCHNAME \
   --env TOOLSTATE_REPO_ACCESS_TOKEN \
   --env TOOLSTATE_REPO \
+  --env TOOLSTATE_PUBLISH \
   --env CI_JOB_NAME="${CI_JOB_NAME-$IMAGE}" \
   --init \
   --rm \