Skip to content

Commit

Permalink
Auto merge of #68047 - pietroalbini:fix-toolstate-again, r=Mark-Simul…
Browse files Browse the repository at this point in the history
…acrum

ci: another take at fixing toolstate

Seems like the variable showed by `$(ciCheckoutPath)` on Azure Pipelines was wrong, making the toolstate script fail. This commit changes that function to return the variable previously used by the toolstate script. Other uses of the function were audited, and there should be no conflict.

Failure log: https://dev.azure.com/rust-lang/rust/_build/results?buildId=17933
r? @Mark-Simulacrum
  • Loading branch information
bors committed Jan 9, 2020
2 parents c404ce6 + cdbb60e commit 59eb49d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/ci/shared.sh
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ function ciCommit {

function ciCheckoutPath {
if isAzurePipelines; then
echo "${SYSTEM_WORKFOLDER}"
echo "${BUILD_SOURCESDIRECTORY}"
elif isGitHubActions; then
echo "${GITHUB_WORKSPACE}"
else
Expand Down

0 comments on commit 59eb49d

Please sign in to comment.