Merge pull request #145 from infosiftr/explicit-rc

Adjust "rc" consumption to be explicit, as in other repositories

Author: yosifkit

.travis.yml

@@ -2,8 +2,8 @@ language: bash
 services: docker
 
 env:
-  - VERSION=1.8 VARIANT=
-  - VERSION=1.8 VARIANT=alpine
+  - VERSION=1.8-rc VARIANT=
+  - VERSION=1.8-rc VARIANT=alpine
   - VERSION=1.7 VARIANT=
   - VERSION=1.7 VARIANT=wheezy
   - VERSION=1.7 VARIANT=alpine

1.8/Dockerfile renamed to 1.8-rc/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.8
+FROM golang:1.8-rc
 
 RUN mkdir -p /go/src/app
 WORKDIR /go/src/app

1.8/alpine/Dockerfile renamed to 1.8-rc/alpine/Dockerfile

@@ -3,6 +3,7 @@ set -eu
 
 declare -A aliases=(
 	[1.7]='1 latest'
+	[1.8-rc]='rc'
 )
 
 self="$(basename "$BASH_SOURCE")"
@@ -50,6 +51,8 @@ join() {
 }
 
 for version in "${versions[@]}"; do
+	rcVersion="${version%-rc}"
+
 	commit="$(dirCommit "$version")"
 
 	fullVersion="$(git show "$commit":"$version/Dockerfile" | awk '$1 == "ENV" && $2 == "GOLANG_VERSION" { print $3; exit }')"
@@ -58,6 +61,13 @@ for version in "${versions[@]}"; do
 	versionAliases=(
 		$fullVersion
 		$version
+	)
+	if [ "$version" != "$rcVersion" ]; then
+		versionAliases+=(
+			$rcVersion
+		)
+	fi
+	versionAliases+=(
 		${aliases[$version]:-}
 	)
 

1.8/alpine/go-wrapper renamed to 1.8-rc/alpine/go-wrapper

@@ -13,11 +13,19 @@ versions=( "${versions[@]%/}" )
 travisEnv=
 googleSource="$(curl -fsSL 'https://golang.org/dl/')"
 for version in "${versions[@]}"; do
+	rcVersion="${version%-rc}"
+	rcGrepV='-v'
+	if [ "$rcVersion" != "$version" ]; then
+		rcGrepV=
+	fi
+	rcGrepV+=' -E'
+	rcGrepExpr='rc'
+
 	# First check for full version from GitHub as a canonical source
-	fullVersion="$(curl -fsSL "https://raw.githubusercontent.com/golang/go/release-branch.go$version/VERSION" 2>/dev/null || true)"
+	fullVersion="$(curl -fsSL "https://raw.githubusercontent.com/golang/go/release-branch.go$rcVersion/VERSION" 2>/dev/null | grep $rcGrepV -- "$rcGrepExpr" || true)"
 	if [ -z "$fullVersion" ]; then
 		echo >&2 "warning: cannot find version from GitHub for $version, scraping golang download page"
-		fullVersion="$(echo $googleSource | grep -Po '">go'"$version"'.*?\.src\.tar\.gz</a>' | sed -r 's!.*go([^"/<]+)\.src\.tar\.gz.*!\1!' | sort -V | tail -1)"
+		fullVersion="$(echo $googleSource | grep -Po '">go'"$rcVersion"'.*?\.src\.tar\.gz</a>' | sed -r 's!.*go([^"/<]+)\.src\.tar\.gz.*!\1!' | grep $rcGrepV -- "$rcGrepExpr" | sort -V | tail -1)"
 	fi
 	if [ -z "$fullVersion" ]; then
 		echo >&2 "warning: cannot find full version for $version"