diff options
| author | bors <bors@rust-lang.org> | 2020-01-09 16:10:01 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-01-09 16:10:01 +0000 |
| commit | 59eb49d0da83fff01ae3c63f2e282b953e5f88df (patch) | |
| tree | b51312a548b4b89be72cfe173daea53d7c6c5881 /src | |
| parent | c404ce689f7692f2c9b1df51803faf88ba11d2e8 (diff) | |
| parent | cdbb60e6a81800b1376752fbd99dbe8f47387266 (diff) | |
| download | rust-59eb49d0da83fff01ae3c63f2e282b953e5f88df.tar.gz rust-59eb49d0da83fff01ae3c63f2e282b953e5f88df.zip | |
Auto merge of #68047 - pietroalbini:fix-toolstate-again, r=Mark-Simulacrum
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/ci/shared.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ci/shared.sh b/src/ci/shared.sh index 0bfd7ff26cf..206065d7072 100644 --- a/src/ci/shared.sh +++ b/src/ci/shared.sh @@ -80,7 +80,7 @@ function ciCommit { function ciCheckoutPath { if isAzurePipelines; then - echo "${SYSTEM_WORKFOLDER}" + echo "${BUILD_SOURCESDIRECTORY}" elif isGitHubActions; then echo "${GITHUB_WORKSPACE}" else |