zig

commit bf4701562cff5f26cb119351a584fc59145a747a (tree)
parent b7fb63d6966cc46da19eda32f99ede5177bbdf4c
Author: Andrew Kelley <andrew@ziglang.org>
Date:   Wed, 20 Mar 2019 23:19:18 -0400

ci: add FreeBSD to download page

Diffstat:
M
ci/azure/linux_script
 | 
10
++++++++++
M
ci/azure/macos_script
 | 
10
++++++++++
M
ci/azure/update_download_page
 | 
8
+++++++-
M
ci/azure/windows_upload
 | 
10
++++++++++
M
ci/srht/freebsd_script
 | 
5
+++--

5 files changed, 40 insertions(+), 3 deletions(-)
diff --git a/ci/azure/linux_script b/ci/azure/linux_script
@@ -34,6 +34,16 @@ if [ "${BUILD_REASON}" != "PullRequest" ]; then
 
   SHASUM=$(sha256sum $ARTIFACTSDIR/$TARBALL | cut '-d ' -f1)
   BYTESIZE=$(wc -c < $ARTIFACTSDIR/$TARBALL)
+
+  JSONFILE="linux-$GITBRANCH.json"
+  touch $JSONFILE
+  echo "{\"tarball\": \"$TARBALL\"," >>$JSONFILE
+  echo "\"shasum\": \"$SHASUM\"," >>$JSONFILE
+  echo "\"size\": \"$BYTESIZE\"}" >>$JSONFILE
+
+  s3cmd put -P "$JSONFILE" "s3://ziglang.org/builds/$JSONFILE"
+  s3cmd put -P "$JSONFILE" "s3://ziglang.org/builds/linux-$VERSION.json"
+
   # `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
diff --git a/ci/azure/macos_script b/ci/azure/macos_script
@@ -91,6 +91,16 @@ if [ "${BUILD_REASON}" != "PullRequest" ]; then
 
   SHASUM=$(shasum -a 256 $TARBALL | cut '-d ' -f1)
   BYTESIZE=$(wc -c < $TARBALL)
+
+  JSONFILE="macos-$GITBRANCH.json"
+  touch $JSONFILE
+  echo "{\"tarball\": \"$TARBALL\"," >>$JSONFILE
+  echo "\"shasum\": \"$SHASUM\"," >>$JSONFILE
+  echo "\"size\": \"$BYTESIZE\"}" >>$JSONFILE
+
+  s3cmd put -P "$JSONFILE" "s3://ziglang.org/builds/$JSONFILE"
+  s3cmd put -P "$JSONFILE" "s3://ziglang.org/builds/macos-$VERSION.json"
+
   # `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
diff --git a/ci/azure/update_download_page b/ci/azure/update_download_page
@@ -6,7 +6,7 @@ set -e
 SRCDIR=$(pwd)
 rm -rf .git
 sudo apt-get update -y
-sudo apt-get install -y s3cmd
+sudo apt-get install -y s3cmd curl jq
 
 cd "$HOME"
 wget "https://ziglang.org/builds/$LINUX_TARBALL"
@@ -22,6 +22,12 @@ tar cfJ "$SRC_TARBALL" "$SRCTARBALLDIR"
 export SRC_SHASUM=$(sha256sum $SRC_TARBALL | cut '-d ' -f1)
 export SRC_BYTESIZE=$(wc -c < $SRC_TARBALL)
 
+# the freebsd build has to be there too
+FREEBSD_JSON=$(curl --fail "https://ziglang.org/builds/freebsd-$VERSION.json" || exit 1)
+export FREEBSD_TARBALL=$(echo "$FREEBSD_JSON" | jq .tarball -r)
+export FREEBSD_BYTESIZE=$(echo "$FREEBSD_JSON" | jq .size -r)
+export FREEBSD_SHASUM=$(echo "$FREEBSD_JSON" | jq .shasum -r)
+
 git clone https://github.com/ziglang/www.ziglang.org --depth 1
 cd www.ziglang.org
 export MASTER_DATE=$(date +%Y-%m-%d)
diff --git a/ci/azure/windows_upload b/ci/azure/windows_upload
@@ -25,6 +25,16 @@ if [ "${BUILD_REASON}" != "PullRequest" ]; then
 
   SHASUM=$(sha256sum $TARBALL | cut '-d ' -f1)
   BYTESIZE=$(wc -c < $TARBALL)
+
+  JSONFILE="windows-$GITBRANCH.json"
+  touch $JSONFILE
+  echo "{\"tarball\": \"$TARBALL\"," >>$JSONFILE
+  echo "\"shasum\": \"$SHASUM\"," >>$JSONFILE
+  echo "\"size\": \"$BYTESIZE\"}" >>$JSONFILE
+
+  s3cmd put -P "$JSONFILE" "s3://ziglang.org/builds/$JSONFILE"
+  s3cmd put -P "$JSONFILE" "s3://ziglang.org/builds/windows-$VERSION.json"
+
   # `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
diff --git a/ci/srht/freebsd_script b/ci/srht/freebsd_script
@@ -29,7 +29,7 @@ if [ -f ~/.s3cfg ]; then
   mv release/bin/zig release/
   rmdir release/bin
 
-  GITBRANCH=$(git rev-parse --abbrev-ref HEAD)
+  GITBRANCH=$(basename $GITHUB_REF)
   VERSION=$(release/zig version)
   DIRNAME="zig-freebsd-x86_64-$VERSION"
   TARBALL="$DIRNAME.tar.xz"
@@ -49,5 +49,6 @@ if [ -f ~/.s3cfg ]; then
   echo "\"shasum\": \"$SHASUM\"," >>$JSONFILE
   echo "\"size\": \"$BYTESIZE\"}" >>$JSONFILE
 
-  s3cmd put -P "$JSONFILE" s3://ziglang.org/builds/$JSONFILE
+  s3cmd put -P "$JSONFILE" "s3://ziglang.org/builds/$JSONFILE"
+  s3cmd put -P "$JSONFILE" "s3://ziglang.org/builds/freebsd-$VERSION.json"
 fi