From 14db2e93b86cc364283374ee80631e28d45f65c3 Mon Sep 17 00:00:00 2001
From: devopsbo3 <69951731+devopsbo3@users.noreply.github.com>
Date: Fri, 10 Nov 2023 12:27:53 -0600
Subject: [PATCH] Revert "travis: get rid of old useless GO111MODULE directives
 (#27991)"

This reverts commit 62e19dde73783c063132718f7c6115fcc8c922db.
---
 .travis.yml | 12 ++++++++++++
 Makefile    |  4 ++--
 2 files changed, 14 insertions(+), 2 deletions(-)

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