fix: Don't claim support for Go version 2

Fixes Agoric#9637

Author: gibson042

repoconfig.sh

@@ -5,25 +5,24 @@ GOLANG_VERSION=1.20.3
 GOLANG_DIR=golang/cosmos
 GOLANG_DAEMON=$GOLANG_DIR/build/agd
 
-# Args are major, minor and patch version numbers
+# golang_version_check $major $minor $patch $version
 golang_version_check() {
   # Keep synchronized with README.md section "Prerequisites".
   {
     [ "$1" -eq 1 ] && [ "$2" -eq 20 ] && [ "$3" -ge 2 ] && return 0
     [ "$1" -eq 1 ] && [ "$2" -ge 21 ] && return 0
-    [ "$1" -ge 2 ] && return 0
   } 2> /dev/null
-  echo 1>&2 "need go version 1.20.2+, 1.21+, or 2+"
+  echo 1>&2 "need Go version 1.20.2+ or 1.21+, found $4"
   return 1
 }
 
-# Args are major, minor and patch version numbers
+# nodejs_version_check $major $minor $patch $version
 nodejs_version_check() {
   # Keep synchronized with README.md section "Prerequisites".
   {
     [ "$1" -eq 18 ] && [ "$2" -ge 12 ] && return 0
     [ "$1" -eq 20 ] && [ "$2" -ge 9 ] && return 0
   } 2> /dev/null
-  echo 1>&2 "need Node.js LTS version ^18.12 or ^20.9, found $1.$2.$3"
+  echo 1>&2 "need Node.js LTS version ^18.12 or ^20.9, found $4"
   return 1
 }

scripts/agd-builder.sh

@@ -109,8 +109,8 @@ if $need_nodejs; then
 
   if nodeversion=$(node --version 2> /dev/null); then
     noderegexp='v([0-9]+)\.([0-9]+)\.([0-9]+)'
-    [[ "$nodeversion" =~ $noderegexp ]] || fatal "illegible node version '$nodeversion'"
-    nodejs_version_check "${BASH_REMATCH[1]}" "${BASH_REMATCH[2]}" "${BASH_REMATCH[3]}" || exit 1
+    [[ "$nodeversion" =~ $noderegexp ]] || fatal "illegible Node.js version '$nodeversion'"
+    nodejs_version_check "${BASH_REMATCH[1]}" "${BASH_REMATCH[2]}" "${BASH_REMATCH[3]}" "$nodeversion"
   fi
 fi
 
@@ -160,9 +160,9 @@ $do_not_build || (
     # Ensure minimum patch versions of Go environment
     cd "$GOLANG_DIR"
     if goversion=$(go version 2> /dev/null); then
-      goregexp='go version go([0-9]+)(.([0-9]+)(.([0-9]+))?)? '
-      [[ "$goversion" =~ $goregexp ]] || fatal "illegible go version '$goversion'"
-      golang_version_check "${BASH_REMATCH[1]}" "${BASH_REMATCH[3]}" "${BASH_REMATCH[5]}"
+      goregexp='go version go([0-9]+)(.([0-9]+)(.([0-9]+))?)?( |$)'
+      [[ "$goversion" =~ $goregexp ]] || fatal "illegible Go version '$goversion'"
+      golang_version_check "${BASH_REMATCH[1]}" "${BASH_REMATCH[3]}" "${BASH_REMATCH[5]}" "$goversion"
       make compile-go
     fi
   )