From 96954d155a65112cd0d6a61c811ce7fb3029d295 Mon Sep 17 00:00:00 2001 From: DisposaBoy Date: Sun, 1 Mar 2020 14:06:25 +0000 Subject: [PATCH] Next (#963) Fix #962 * Prep v20.03.01 --- CHANGELOG.md | 4 ++++ gosubl/about.py | 2 +- src/margo.sh/sublime/sublime.go | 8 ++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b05b92cb..27ad4754 100644 --- 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 index d85e6573..acd01390 100644 --- 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 index f577bc71..fd27a854 100644 --- 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"