[dev.boringcrypto] misc/boring: add src releases

Change-Id: I7aa63f9934cd9945420a9742b9dcaed6a44cd350
Reviewed-on: https://go-review.googlesource.com/66911
Run-TryBot: Russ Cox <rsc@golang.org>
Reviewed-by: Russ Cox <rsc@golang.org>

diff --git a/misc/boring/RELEASES b/misc/boring/RELEASES
index 55aa73b5dd9284bf16a45c9dadd6b8cfe738d57b..1399cdb280412308f34feec41006d28aedd3a447 100644 (file)
--- a/misc/boring/RELEASES
+++ b/misc/boring/RELEASES
@@ -1,7 +1,9 @@
 # This file lists published Go+BoringCrypto releases.
-# Each line describes a single release: <version> <git commit> <URL> <sha256sum>
-go1.9rc2b2 91753387bdf7 https://go-boringcrypto.storage.googleapis.com/go1.9rc2b2.linux-amd64.tar.gz 59355a45e6970e8013060851ddb3f079afe8db52e90db520a0826a13f1b5ae5b
-go1.8.3b3 f6ff81bac156 https://go-boringcrypto.storage.googleapis.com/go1.8.3b3.linux-amd64.tar.gz 6287ad971cd268bb2684fb8b1275dea928ad527823062bc057e73036c419e7af
-go1.9rc2b4 c339bc4e07a6 https://go-boringcrypto.storage.googleapis.com/go1.9rc2b4.linux-amd64.tar.gz a8f677d48dc93920065fca4dca1a55bf7110aba132489c47e25d26d55c67eb32
-go1.9b4 e6ad24cde71e https://go-boringcrypto.storage.googleapis.com/go1.9b4.linux-amd64.tar.gz 6592e36a05df8e7c59812328a3a4bfa6c4eed72132fc31245951c3ade3ef2a8a
-go1.8.3b4 42cb4dcdb59a https://go-boringcrypto.storage.googleapis.com/go1.8.3b4.linux-amd64.tar.gz 4011c86e6175925e1c63dc7c19a51f825be53bbe7b08260918e5107b0fbd4f85
+# Each line describes a single release: <version> <git commit> <target> <URL> <sha256sum>
+go1.9rc2b2 91753387bdf7 linux-amd64 https://go-boringcrypto.storage.googleapis.com/go1.9rc2b2.linux-amd64.tar.gz 59355a45e6970e8013060851ddb3f079afe8db52e90db520a0826a13f1b5ae5b
+go1.8.3b3 f6ff81bac156 linux-amd64 https://go-boringcrypto.storage.googleapis.com/go1.8.3b3.linux-amd64.tar.gz 6287ad971cd268bb2684fb8b1275dea928ad527823062bc057e73036c419e7af
+go1.9rc2b4 c339bc4e07a6 linux-amd64 https://go-boringcrypto.storage.googleapis.com/go1.9rc2b4.linux-amd64.tar.gz a8f677d48dc93920065fca4dca1a55bf7110aba132489c47e25d26d55c67eb32
+go1.9b4 e6ad24cde71e linux-amd64 https://go-boringcrypto.storage.googleapis.com/go1.9b4.linux-amd64.tar.gz 6592e36a05df8e7c59812328a3a4bfa6c4eed72132fc31245951c3ade3ef2a8a
+go1.9b4 e6ad24cde71e src https://go-boringcrypto.storage.googleapis.com/go1.9b4.src.tar.gz c85f31dc743fee0e8ce0c6ffc286e27c1f51b66c9b923afafb43cdc378a41091
+go1.8.3b4 42cb4dcdb59a linux-amd64 https://go-boringcrypto.storage.googleapis.com/go1.8.3b4.linux-amd64.tar.gz 4011c86e6175925e1c63dc7c19a51f825be53bbe7b08260918e5107b0fbd4f85
+go1.8.3b4 42cb4dcdb59a src https://go-boringcrypto.storage.googleapis.com/go1.8.3b4.src.tar.gz 2531ca8918aa024aed8f4a6c9e5c3b25bc8777623f1efa66aec7214601d474e4

diff --git a/misc/boring/build.docker b/misc/boring/build.docker
index 0ddd8708dd653e3ce8c71806989d034e9bf5525a..992c8595e4c9bcda34ba101c923b0c7a10e08783 100755 (executable)
--- a/misc/boring/build.docker
+++ b/misc/boring/build.docker
@@ -8,10 +8,10 @@
 
 set -e
 
-# With no arguments, use the most recent release in the RELEASES file.
+# With no arguments, use the most recent linux-amd64 release in the RELEASES file.
 case "$#" in
 0)
-       version=$(tail -1 RELEASES | awk '{print $1}');;
+       version=$(grep linux-amd64 RELEASES | tail -1 | awk '{print $1}');;
 1)
        version="$1";;
 *)
@@ -19,8 +19,8 @@ case "$#" in
        exit 2
 esac
 
-url="$(grep "^$version " RELEASES | awk '{print $3}')"
-sha256="$(grep "^$version " RELEASES | awk '{print $4}')"
+url="$(grep "^$version .* linux-amd64 " RELEASES | awk '{print $4}')"
+sha256="$(grep "^$version .* linux-amd64 " RELEASES | awk '{print $5}')"
 if [ "$sha256" = "" ]; then
        echo "cannot find $version in RELEASES file" >&2
        exit 2

diff --git a/misc/boring/build.release b/misc/boring/build.release
index bf06943f6b6a86e87f77d655263db9f6810b654c..88b617694b01788f599bf26803e3785f09bc002a 100755 (executable)
--- a/misc/boring/build.release
+++ b/misc/boring/build.release
@@ -66,9 +66,13 @@ go get -u golang.org/x/build/cmd/release
 # Build the release.
 shortgo=$(echo "$base" | perl -pe 's/(go\d+\.\d+)(\.\d+|rc\d+)/$1/')
 $dir/release -target linux-amd64 -rev "$commit" -version "$version" -tools "release-branch.$shortgo"
+$dir/release -target src -rev "$commit" -version "$version" -tools "release-branch.$shortgo"
 output="$version.linux-amd64.tar.gz"
 ls -l "$output"
 sha256=$(sha256sum "$output" | awk '{print $1}')
+outputsrc="$version.src.tar.gz"
+ls -l "$outputsrc"
+sha256src=$(sha256sum "$outputsrc" | awk '{print $1}')
 
 trap "rm -f /tmp/go.release.$$ /tmp/go.nm.$$" EXIT
 tar -xzf "$output" -O go/bin/go >/tmp/go.release.$$
@@ -85,6 +89,9 @@ fi
 # Publish the release.
 gsutil cp "$output" gs://go-boringcrypto/
 url="https://go-boringcrypto.storage.googleapis.com/$output"
+gsutil cp "$outputsrc" gs://go-boringcrypto/
+urlsrc="https://go-boringcrypto.storage.googleapis.com/$outputsrc"
 
 # Record that it was published.
-echo "$version $commit $url $sha256" >>RELEASES
+echo "$version $commit linux-amd64 $url $sha256" >>RELEASES
+echo "$version $commit src $urlsrc $sha256src" >>RELEASES