From 3f88e27d0f0df23324314329e6d2491d60e1d5de Mon Sep 17 00:00:00 2001
From: Aliaksandr Valialkin <valyala@gmail.com>
Date: Tue, 15 Dec 2020 13:13:46 +0200
Subject: [PATCH] Do not set `GO111MODULE=off` during `go install`, since this
 doesnt work in Go1.14 and Go1.15

---
 .github/workflows/main.yml | 2 --
 Makefile                   | 6 +++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c0debd8d1..68986c905 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -13,8 +13,6 @@ jobs:
           go-version: 1.15
         id: go
       - name: Dependencies
-        env:
-          GO111MODULE: off
         run: |
           go install golang.org/x/lint/golint
           go install github.com/kisielk/errcheck
diff --git a/Makefile b/Makefile
index 9e39e116f..05565bc66 100644
--- a/Makefile
+++ b/Makefile
@@ -99,7 +99,7 @@ lint: install-golint
 	golint app/...
 
 install-golint:
-	which golint || GO111MODULE=off go install golang.org/x/lint/golint
+	which golint || go install golang.org/x/lint/golint
 
 errcheck: install-errcheck
 	errcheck -exclude=errcheck_excludes.txt ./lib/...
@@ -113,7 +113,7 @@ errcheck: install-errcheck
 	errcheck -exclude=errcheck_excludes.txt ./app/vmrestore/...
 
 install-errcheck:
-	which errcheck || GO111MODULE=off go install github.com/kisielk/errcheck
+	which errcheck || go install github.com/kisielk/errcheck
 
 check-all: fmt vet lint errcheck golangci-lint
 
@@ -159,7 +159,7 @@ quicktemplate-gen: install-qtc
 	qtc
 
 install-qtc:
-	which qtc || GO111MODULE=off go install github.com/valyala/quicktemplate/qtc
+	which qtc || go install github.com/valyala/quicktemplate/qtc
 
 
 golangci-lint: install-golangci-lint