summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2019-06-17 12:32:07 +0000
committerNick Thomas <nick@gitlab.com>2019-06-17 12:32:07 +0000
commite896becc9f6ee5ce9b134c32d7784f7c408bb50e (patch)
tree3caa9f848427b82e57528acc981df90d6b7a7148
parentd18543c7e3b850001a5b72822864c6d68ba17fbe (diff)
parent636ce937115214bc0b2938c9f4bbe278c5907e77 (diff)
downloadgitlab-shell-e896becc9f6ee5ce9b134c32d7784f7c408bb50e.tar.gz
Merge branch 'zj-disable-go-mod-explicitly' into 'master'
Set Go111MODULE to 'off' during compilation See merge request gitlab-org/gitlab-shell!315
-rw-r--r--support/go_build.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/support/go_build.rb b/support/go_build.rb
index 792ebc0..d11cc38 100644
--- a/support/go_build.rb
+++ b/support/go_build.rb
@@ -12,7 +12,8 @@ module GoBuild
GO_ENV = {
'GOPATH' => BUILD_DIR,
- 'GO15VENDOREXPERIMENT' => '1'
+ 'GO15VENDOREXPERIMENT' => '1',
+ 'GO111MODULE' => 'off'
}.freeze
def create_fresh_build_dir