extract: support building/running yaegi with Go devel

Fixes #928
traefik · Nov 5, 2020 · f0fc907 · f0fc907
1 parent 61f4704
commit f0fc907
Show file tree

Hide file tree

Showing 227 changed files with 239 additions and 231 deletions.
diff --git a/extract/extract.go b/extract/extract.go
@@ -436,10 +436,12 @@ func GetMinor(part string) string {
 	return minor
 }
 
+const defaultMinorVersion = 15
+
 func genBuildTags() (string, error) {
 	version := runtime.Version()
-	if version == "devel" {
-		return "", nil
+	if strings.HasPrefix(version, "devel") {
+		return "", fmt.Errorf("extracting only supported with stable releases of Go, not %v", version)
 	}
 	parts := strings.Split(version, ".")
 
@@ -452,6 +454,11 @@ func genBuildTags() (string, error) {
 		return "", fmt.Errorf("failed to parse version: %v", err)
 	}
 
+	// Only append an upper bound if we are not on the latest go
+	if minor >= defaultMinorVersion {
+		return currentGoVersion, nil
+	}
+
 	nextGoVersion := parts[0] + "." + strconv.Itoa(minor+1)
 
 	return currentGoVersion + ",!" + nextGoVersion, nil

diff --git a/internal/cmd/extract/extract.go b/internal/cmd/extract/extract.go
@@ -84,11 +84,12 @@ func main() {
 			oFile = strings.ReplaceAll(importPath, "/", "_") + ".go"
 		}
 
-		prefix := runtime.Version()
-		if runtime.Version() != "devel" {
-			parts := strings.Split(runtime.Version(), ".")
-			prefix = parts[0] + "_" + extract.GetMinor(parts[1])
+		version := runtime.Version()
+		if strings.HasPrefix(version, "devel") {
+			log.Fatalf("extracting only supported with stable releases of Go, not %v", version)
 		}
+		parts := strings.Split(version, ".")
+		prefix := parts[0] + "_" + extract.GetMinor(parts[1])
 
 		f, err := os.Create(prefix + "_" + oFile)
 		if err != nil {

diff --git a/stdlib/go1_15_archive_tar.go b/stdlib/go1_15_archive_tar.go
diff --git a/stdlib/go1_15_archive_zip.go b/stdlib/go1_15_archive_zip.go
diff --git a/stdlib/go1_15_bufio.go b/stdlib/go1_15_bufio.go
diff --git a/stdlib/go1_15_bytes.go b/stdlib/go1_15_bytes.go
diff --git a/stdlib/go1_15_compress_bzip2.go b/stdlib/go1_15_compress_bzip2.go
diff --git a/stdlib/go1_15_compress_flate.go b/stdlib/go1_15_compress_flate.go
diff --git a/stdlib/go1_15_compress_gzip.go b/stdlib/go1_15_compress_gzip.go
diff --git a/stdlib/go1_15_compress_lzw.go b/stdlib/go1_15_compress_lzw.go
diff --git a/stdlib/go1_15_compress_zlib.go b/stdlib/go1_15_compress_zlib.go
diff --git a/stdlib/go1_15_container_heap.go b/stdlib/go1_15_container_heap.go
diff --git a/stdlib/go1_15_container_list.go b/stdlib/go1_15_container_list.go
diff --git a/stdlib/go1_15_container_ring.go b/stdlib/go1_15_container_ring.go
diff --git a/stdlib/go1_15_context.go b/stdlib/go1_15_context.go
diff --git a/stdlib/go1_15_crypto.go b/stdlib/go1_15_crypto.go
diff --git a/stdlib/go1_15_crypto_aes.go b/stdlib/go1_15_crypto_aes.go
diff --git a/stdlib/go1_15_crypto_cipher.go b/stdlib/go1_15_crypto_cipher.go
diff --git a/stdlib/go1_15_crypto_des.go b/stdlib/go1_15_crypto_des.go
diff --git a/stdlib/go1_15_crypto_dsa.go b/stdlib/go1_15_crypto_dsa.go
diff --git a/stdlib/go1_15_crypto_ecdsa.go b/stdlib/go1_15_crypto_ecdsa.go
diff --git a/stdlib/go1_15_crypto_ed25519.go b/stdlib/go1_15_crypto_ed25519.go
diff --git a/stdlib/go1_15_crypto_elliptic.go b/stdlib/go1_15_crypto_elliptic.go
diff --git a/stdlib/go1_15_crypto_hmac.go b/stdlib/go1_15_crypto_hmac.go
diff --git a/stdlib/go1_15_crypto_md5.go b/stdlib/go1_15_crypto_md5.go
diff --git a/stdlib/go1_15_crypto_rand.go b/stdlib/go1_15_crypto_rand.go
diff --git a/stdlib/go1_15_crypto_rc4.go b/stdlib/go1_15_crypto_rc4.go
diff --git a/stdlib/go1_15_crypto_rsa.go b/stdlib/go1_15_crypto_rsa.go
diff --git a/stdlib/go1_15_crypto_sha1.go b/stdlib/go1_15_crypto_sha1.go
diff --git a/stdlib/go1_15_crypto_sha256.go b/stdlib/go1_15_crypto_sha256.go
diff --git a/stdlib/go1_15_crypto_sha512.go b/stdlib/go1_15_crypto_sha512.go
diff --git a/stdlib/go1_15_crypto_subtle.go b/stdlib/go1_15_crypto_subtle.go
diff --git a/stdlib/go1_15_crypto_tls.go b/stdlib/go1_15_crypto_tls.go
diff --git a/stdlib/go1_15_crypto_x509.go b/stdlib/go1_15_crypto_x509.go
diff --git a/stdlib/go1_15_crypto_x509_pkix.go b/stdlib/go1_15_crypto_x509_pkix.go
diff --git a/stdlib/go1_15_database_sql.go b/stdlib/go1_15_database_sql.go
diff --git a/stdlib/go1_15_database_sql_driver.go b/stdlib/go1_15_database_sql_driver.go
diff --git a/stdlib/go1_15_debug_dwarf.go b/stdlib/go1_15_debug_dwarf.go
diff --git a/stdlib/go1_15_debug_elf.go b/stdlib/go1_15_debug_elf.go
diff --git a/stdlib/go1_15_debug_gosym.go b/stdlib/go1_15_debug_gosym.go
diff --git a/stdlib/go1_15_debug_macho.go b/stdlib/go1_15_debug_macho.go
diff --git a/stdlib/go1_15_debug_pe.go b/stdlib/go1_15_debug_pe.go
diff --git a/stdlib/go1_15_debug_plan9obj.go b/stdlib/go1_15_debug_plan9obj.go
diff --git a/stdlib/go1_15_encoding.go b/stdlib/go1_15_encoding.go
diff --git a/stdlib/go1_15_encoding_ascii85.go b/stdlib/go1_15_encoding_ascii85.go
diff --git a/stdlib/go1_15_encoding_asn1.go b/stdlib/go1_15_encoding_asn1.go