Merge #36389

36389: build: Allow go 1.12 again r=petermattis a=bdarnell Fears of invalid builds have been resolved, so we no longer need to prohibit this. Note that it is difficult to be lint-clean with both 1.11 and 1.12 simultaneously, so we'll have to wait to fix the new lint issues until we move to 1.12 as the minimum version (post CRDB 19.1) Updates #35637 Release note: None Co-authored-by: Ben Darnell <[email protected]>
cockroachdb · Apr 1, 2019 · 4421c14 · 4421c14
2 parents a6147b7 + 053aa1b
commit 4421c14
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/build/go-version-check.sh b/build/go-version-check.sh
@@ -26,9 +26,3 @@ if (( version_major != required_version_major )) || (( version_minor < minimum_v
   echo "go$required_version_major.$minimum_version_minor+ required (detected go$version)" >&2
   exit 1
 fi
-
-# Pending resolution of #35637
-if [ $version_minor -ge 12 ]; then
-  echo "go 1.12+ is known to produce invalid crdb builds, see https://github.com/cockroachdb/cockroach/issues/35637" >&2
-  exit 1
-fi