From 52219ced8bb8c44154b55af27c0947276c2d6437 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= <peterke@gmail.com>
Date: Wed, 23 Aug 2023 18:54:30 +0300
Subject: [PATCH] travis: get rid of old useless GO111MODULE directives
 (#27991)

---
 .travis.yml | 12 ------------
 Makefile    |  4 ++--
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9e4a9390c..4f5d482c6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -66,7 +66,6 @@ jobs:
       go: 1.21.x
       env:
         - azure-linux
-        - GO111MODULE=on
       git:
         submodules: false # avoid cloning ethereum/tests
       addons:
@@ -100,7 +99,6 @@ jobs:
       go: 1.21.x
       env:
         - azure-osx
-        - GO111MODULE=on
       git:
         submodules: false # avoid cloning ethereum/tests
       script:
@@ -113,8 +111,6 @@ jobs:
       arch: amd64
       dist: bionic
       go: 1.21.x
-      env:
-        - GO111MODULE=on
       script:
         - travis_wait 30 go run build/ci.go test $TEST_PACKAGES
 
@@ -124,8 +120,6 @@ jobs:
       arch: arm64
       dist: bionic
       go: 1.20.x
-      env:
-        - GO111MODULE=on
       script:
         - travis_wait 30 go run build/ci.go test $TEST_PACKAGES
 
@@ -133,8 +127,6 @@ jobs:
       os: linux
       dist: bionic
       go: 1.20.x
-      env:
-        - GO111MODULE=on
       script:
         - travis_wait 30 go run build/ci.go test $TEST_PACKAGES
 
@@ -146,7 +138,6 @@ jobs:
       go: 1.21.x
       env:
         - ubuntu-ppa
-        - GO111MODULE=on
       git:
         submodules: false # avoid cloning ethereum/tests
       addons:
@@ -170,7 +161,6 @@ jobs:
       go: 1.21.x
       env:
         - azure-purge
-        - GO111MODULE=on
       git:
         submodules: false # avoid cloning ethereum/tests
       script:
@@ -182,8 +172,6 @@ jobs:
       os: linux
       dist: bionic
       go: 1.21.x
-      env:
-        - GO111MODULE=on
       script:
         - travis_wait 30 go run build/ci.go test  -race $TEST_PACKAGES
 
diff --git a/Makefile b/Makefile
index e6286da7f..d736ef61c 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@
 
 GOBIN = ./build/bin
 GO ?= latest
-GORUN = env GO111MODULE=on go run
+GORUN = go run
 
 geth:
 	$(GORUN) build/ci.go install ./cmd/geth
@@ -23,7 +23,7 @@ lint: ## Run linters.
 	$(GORUN) build/ci.go lint
 
 clean:
-	env GO111MODULE=on go clean -cache
+	go clean -cache
 	rm -fr build/_workspace/pkg/ $(GOBIN)/*
 
 # The devtools target installs tools required for 'go generate'.