diff options
| author | Andrew Kelley <superjoe30@gmail.com> | 2018-12-23 17:04:26 -0500 |
|---|---|---|
| committer | Andrew Kelley <superjoe30@gmail.com> | 2018-12-23 17:04:26 -0500 |
| commit | c00216701c64269a2395e84f3ccff99d6fb89ffc (patch) | |
| tree | 9fa071b9e96f9eadc5069b71634b11fc13b00839 /ci | |
| parent | c21884e1d64e4193e03be4f3064917a26b34b142 (diff) | |
| parent | 45081c1e9cc28757cb563c77553631f7a92b29d8 (diff) | |
| download | zig-c00216701c64269a2395e84f3ccff99d6fb89ffc.tar.gz zig-c00216701c64269a2395e84f3ccff99d6fb89ffc.zip | |
Merge remote-tracking branch 'origin/master' into llvm8
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/azure/linux_script | 3 | ||||
| -rwxr-xr-x | ci/azure/macos_script | 3 | ||||
| -rwxr-xr-x | ci/azure/windows_install | 1 | ||||
| -rwxr-xr-x | ci/azure/windows_upload | 3 |
4 files changed, 10 insertions, 0 deletions
diff --git a/ci/azure/linux_script b/ci/azure/linux_script index 2d9e625782..ab9dacd46a 100755 --- a/ci/azure/linux_script +++ b/ci/azure/linux_script @@ -34,6 +34,9 @@ if [ "${BUILD_REASON}" != "PullRequest" ]; then SHASUM=$(sha256sum $ARTIFACTSDIR/$TARBALL | cut '-d ' -f1) BYTESIZE=$(wc -c < $ARTIFACTSDIR/$TARBALL) + # `set -x` causes these variables to be mangled. + # See https://developercommunity.visualstudio.com/content/problem/375679/pipeline-variable-incorrectly-inserts-single-quote.html + set +x echo "##vso[task.setvariable variable=tarball;isOutput=true]$TARBALL" echo "##vso[task.setvariable variable=shasum;isOutput=true]$SHASUM" echo "##vso[task.setvariable variable=bytesize;isOutput=true]$BYTESIZE" diff --git a/ci/azure/macos_script b/ci/azure/macos_script index 4bb2ae2c43..37af04f10c 100755 --- a/ci/azure/macos_script +++ b/ci/azure/macos_script @@ -98,6 +98,9 @@ if [ "${BUILD_REASON}" != "PullRequest" ]; then SHASUM=$(shasum -a 256 $TARBALL | cut '-d ' -f1) BYTESIZE=$(wc -c < $TARBALL) + # `set -x` causes these variables to be mangled. + # See https://developercommunity.visualstudio.com/content/problem/375679/pipeline-variable-incorrectly-inserts-single-quote.html + set +x echo "##vso[task.setvariable variable=tarball;isOutput=true]$TARBALL" echo "##vso[task.setvariable variable=shasum;isOutput=true]$SHASUM" echo "##vso[task.setvariable variable=bytesize;isOutput=true]$BYTESIZE" diff --git a/ci/azure/windows_install b/ci/azure/windows_install index 846973a179..5f01d9a620 100755 --- a/ci/azure/windows_install +++ b/ci/azure/windows_install @@ -3,6 +3,7 @@ set -x set -e +pacman -Su --needed --noconfirm pacman -S --needed --noconfirm wget p7zip python3-pip pip install s3cmd wget -nv "https://ziglang.org/deps/llvm%2bclang-8.0.0-win64-msvc-release.tar.xz" diff --git a/ci/azure/windows_upload b/ci/azure/windows_upload index 8d30980fea..7d23ac7aad 100755 --- a/ci/azure/windows_upload +++ b/ci/azure/windows_upload @@ -25,6 +25,9 @@ if [ "${BUILD_REASON}" != "PullRequest" ]; then SHASUM=$(sha256sum $TARBALL | cut '-d ' -f1) BYTESIZE=$(wc -c < $TARBALL) + # `set -x` causes these variables to be mangled. + # See https://developercommunity.visualstudio.com/content/problem/375679/pipeline-variable-incorrectly-inserts-single-quote.html + set +x echo "##vso[task.setvariable variable=tarball;isOutput=true]$TARBALL" echo "##vso[task.setvariable variable=shasum;isOutput=true]$SHASUM" echo "##vso[task.setvariable variable=bytesize;isOutput=true]$BYTESIZE" |