Skip to content

Commit

Permalink
Rollup merge of #63191 - pietroalbini:really-fix-toolstate, r=alexcri…
Browse files Browse the repository at this point in the history
…chton

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 #63190
  • Loading branch information
pietroalbini authored Aug 1, 2019
2 parents aa15dad + 8f8b3f2 commit b1d5e52
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions src/ci/docker/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down

0 comments on commit b1d5e52

Please sign in to comment.