support .0 releases starting with 1.21.0

WillAbides · Aug 3, 2023 · 6b49f7f · 6b49f7f
1 parent 8af5eb4
commit 6b49f7f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/src/lib.pl b/src/lib.pl
@@ -72,6 +72,14 @@ sub go_version_string {
     my $major_v = $$v{"major"};
     my $minor_v = $$v{"minor"};
     my $patch_v = $$v{"patch"};
+
+    # For 1.21 and above with no pre-release, always return major.minor.patch
+    if ( $major_v > 1 || ( $major_v == 1 && $minor_v >= 21 ) ) {
+        if ( $$v{"pre_release"} eq "" ) {
+            return "$major_v.$minor_v.$patch_v";
+        }
+    }
+
     $patch_v = "" if $patch_v == 0;
     $minor_v = "" if $minor_v == 0 && $patch_v eq "";
     my $st = "$$v{'major'}";

diff --git a/src/lib_test.sh b/src/lib_test.sh
@@ -88,6 +88,9 @@ test_select_go_version() {
   do_test_select_go_version "" "x" "1.14beta1"
   do_test_select_go_version "0" "x" "0"
   do_test_select_go_version "" "1.2.3"
+  do_test_select_go_version "1.21.0" "1.21.x" "1.21.0"
+  do_test_select_go_version "1.21.0" "1.21" "1.21.0"
+  do_test_select_go_version "1.20" "1.20.x" "1.20.0"
 }
 
 test_select_remote_version() {