Skip to content

Commit 52219ce

Browse files
authored
travis: get rid of old useless GO111MODULE directives (ethereum#27991)
1 parent 76d4ac1 commit 52219ce

File tree

2 files changed

+2
-14
lines changed

2 files changed

+2
-14
lines changed

.travis.yml

-12
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ jobs:
6666
go: 1.21.x
6767
env:
6868
- azure-linux
69-
- GO111MODULE=on
7069
git:
7170
submodules: false # avoid cloning ethereum/tests
7271
addons:
@@ -100,7 +99,6 @@ jobs:
10099
go: 1.21.x
101100
env:
102101
- azure-osx
103-
- GO111MODULE=on
104102
git:
105103
submodules: false # avoid cloning ethereum/tests
106104
script:
@@ -113,8 +111,6 @@ jobs:
113111
arch: amd64
114112
dist: bionic
115113
go: 1.21.x
116-
env:
117-
- GO111MODULE=on
118114
script:
119115
- travis_wait 30 go run build/ci.go test $TEST_PACKAGES
120116

@@ -124,17 +120,13 @@ jobs:
124120
arch: arm64
125121
dist: bionic
126122
go: 1.20.x
127-
env:
128-
- GO111MODULE=on
129123
script:
130124
- travis_wait 30 go run build/ci.go test $TEST_PACKAGES
131125

132126
- stage: build
133127
os: linux
134128
dist: bionic
135129
go: 1.20.x
136-
env:
137-
- GO111MODULE=on
138130
script:
139131
- travis_wait 30 go run build/ci.go test $TEST_PACKAGES
140132

@@ -146,7 +138,6 @@ jobs:
146138
go: 1.21.x
147139
env:
148140
- ubuntu-ppa
149-
- GO111MODULE=on
150141
git:
151142
submodules: false # avoid cloning ethereum/tests
152143
addons:
@@ -170,7 +161,6 @@ jobs:
170161
go: 1.21.x
171162
env:
172163
- azure-purge
173-
- GO111MODULE=on
174164
git:
175165
submodules: false # avoid cloning ethereum/tests
176166
script:
@@ -182,8 +172,6 @@ jobs:
182172
os: linux
183173
dist: bionic
184174
go: 1.21.x
185-
env:
186-
- GO111MODULE=on
187175
script:
188176
- travis_wait 30 go run build/ci.go test -race $TEST_PACKAGES
189177

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
GOBIN = ./build/bin
88
GO ?= latest
9-
GORUN = env GO111MODULE=on go run
9+
GORUN = go run
1010

1111
geth:
1212
$(GORUN) build/ci.go install ./cmd/geth
@@ -23,7 +23,7 @@ lint: ## Run linters.
2323
$(GORUN) build/ci.go lint
2424

2525
clean:
26-
env GO111MODULE=on go clean -cache
26+
go clean -cache
2727
rm -fr build/_workspace/pkg/ $(GOBIN)/*
2828

2929
# The devtools target installs tools required for 'go generate'.

0 commit comments

Comments
 (0)