Commit caf1ec9474

Andrew Kelley <superjoe30@gmail.com>
2018-11-05 05:26:23
ci: fix shasum commands
master
1 parent eb1c769
Changed files (3)
ci
azure
linux_script
macos_script
windows_upload
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"
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"
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"