Next (#963)

Fix #962 * Prep v20.03.01
DisposaBoy · Mar 1, 2020 · 96954d1 · 96954d1
1 parent 8265060
commit 96954d1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,10 @@ https://margo.sh/b/motd - Get notified when GoSublime has a new release.
 
 ## Changes
 
+## 20.03.01
+
+This release fixes a margo build failure when upgrading to go1.14.
+
 ## 20.02.01
 
 This release focuses on fixing a performance issue due to a failure to resetting all cached data prematurely.

diff --git a/gosubl/about.py b/gosubl/about.py
@@ -1,7 +1,7 @@
 import re
 import sublime
 
-TAG = '20.02.01-1'
+TAG = '20.03.01-1'
 ANN = 'a'+TAG
 VERSION = 'r'+TAG
 VERSION_PAT = re.compile(r'\d{2}[.]\d{2}[.]\d{2}-\d+', re.IGNORECASE)

diff --git a/src/margo.sh/sublime/sublime.go b/src/margo.sh/sublime/sublime.go
@@ -43,7 +43,15 @@ func buildAction(c *cli.Context) error {
 	tags := "margo"
 	errs := []string{}
 
+	modWas, modSet := os.LookupEnv("GO111MODULE")
+	// guess: dotless module names are reserved,
+	// so the import fails because `margo` is not in GOROOT
+	// I <3 Go modules!
+	os.Setenv("GO111MODULE", "off")
 	pkg, err := extensionPkg()
+	if modSet {
+		os.Setenv("GO111MODULE", modWas)
+	}
 	if err == nil {
 		fixExtPkg(pkg)
 		tags = "margo margo_extension"