From caf1ec94747ca3c5cae6f9a21b25d1a6c350bbb7 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Sun, 4 Nov 2018 23:26:23 -0500 Subject: [PATCH] ci: fix shasum commands --- ci/azure/linux_script | 2 +- ci/azure/macos_script | 2 +- ci/azure/windows_upload | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/azure/linux_script b/ci/azure/linux_script index 5a83180ca9..6538c2145a 100755 --- a/ci/azure/linux_script +++ b/ci/azure/linux_script @@ -32,7 +32,7 @@ if [ "${BUILD_REASON}" != "PullRequest" ]; then touch empty s3cmd put -P empty s3://ziglang.org/builds/zig-linux-x86_64-$BUILD_SOURCEBRANCHNAME.tar.xz --add-header="Cache-Control: max-age=0, must-revalidate" --add-header=x-amz-website-redirect-location:/builds/$TARBALL - SHASUM=$(sha256sum $ARTIFACTSDIR/$TARBALL) + SHASUM=$(sha256sum $ARTIFACTSDIR/$TARBALL | cut '-d ' -f1) BYTESIZE=$(wc -c < $ARTIFACTSDIR/$TARBALL) echo "##vso[task.setvariable variable=tarball;isOutput=true]$TARBALL" echo "##vso[task.setvariable variable=shasum;isOutput=true]$SHASUM" diff --git a/ci/azure/macos_script b/ci/azure/macos_script index f6fdb9bfef..67e42d0e9d 100755 --- a/ci/azure/macos_script +++ b/ci/azure/macos_script @@ -96,7 +96,7 @@ if [ "${BUILD_REASON}" != "PullRequest" ]; then touch empty s3cmd put -P empty s3://ziglang.org/builds/zig-macos-x86_64-$BUILD_SOURCEBRANCHNAME.tar.xz --add-header="Cache-Control: max-age=0, must-revalidate" --add-header="x-amz-website-redirect-location:/builds/$TARBALL" - SHASUM=$(sha256sum $TARBALL) + SHASUM=$(shasum -a 256 $TARBALL | cut '-d ' -f1) BYTESIZE=$(wc -c < $TARBALL) echo "##vso[task.setvariable variable=tarball;isOutput=true]$TARBALL" echo "##vso[task.setvariable variable=shasum;isOutput=true]$SHASUM" diff --git a/ci/azure/windows_upload b/ci/azure/windows_upload index 0c253986a2..7546f43699 100755 --- a/ci/azure/windows_upload +++ b/ci/azure/windows_upload @@ -22,7 +22,7 @@ if [ "${BUILD_REASON}" != "PullRequest" ]; then touch empty s3cmd put -P empty s3://ziglang.org/builds/zig-windows-x86_64-$BUILD_SOURCEBRANCHNAME.tar.xz --add-header="Cache-Control: max-age=0, must-revalidate" --add-header="x-amz-website-redirect-location:/builds/$TARBALL" - SHASUM=$(sha256sum $TARBALL) + SHASUM=$(sha256sum $TARBALL | cut '-d ' -f1) BYTESIZE=$(wc -c < $TARBALL) echo "##vso[task.setvariable variable=tarball;isOutput=true]$TARBALL" echo "##vso[task.setvariable variable=shasum;isOutput=true]$SHASUM"