Revert "travis: get rid of old useless GO111MODULE directives (#27991)"

This reverts commit 62e19dde73.
This commit is contained in:
devopsbo3 2023-11-10 12:27:53 -06:00 committed by GitHub
parent 91a58b979c
commit 14db2e93b8
2 changed files with 14 additions and 2 deletions

View file

@ -66,6 +66,7 @@ jobs:
go: 1.21.x go: 1.21.x
env: env:
- azure-linux - azure-linux
- GO111MODULE=on
git: git:
submodules: false # avoid cloning ethereum/tests submodules: false # avoid cloning ethereum/tests
addons: addons:
@ -99,6 +100,7 @@ jobs:
go: 1.21.x go: 1.21.x
env: env:
- azure-osx - azure-osx
- GO111MODULE=on
git: git:
submodules: false # avoid cloning ethereum/tests submodules: false # avoid cloning ethereum/tests
script: script:
@ -111,6 +113,8 @@ jobs:
arch: amd64 arch: amd64
dist: bionic dist: bionic
go: 1.21.x go: 1.21.x
env:
- GO111MODULE=on
script: script:
- travis_wait 30 go run build/ci.go test $TEST_PACKAGES - travis_wait 30 go run build/ci.go test $TEST_PACKAGES
@ -120,6 +124,8 @@ jobs:
arch: arm64 arch: arm64
dist: bionic dist: bionic
go: 1.20.x go: 1.20.x
env:
- GO111MODULE=on
script: script:
- travis_wait 30 go run build/ci.go test $TEST_PACKAGES - travis_wait 30 go run build/ci.go test $TEST_PACKAGES
@ -127,6 +133,8 @@ jobs:
os: linux os: linux
dist: bionic dist: bionic
go: 1.20.x go: 1.20.x
env:
- GO111MODULE=on
script: script:
- travis_wait 30 go run build/ci.go test $TEST_PACKAGES - travis_wait 30 go run build/ci.go test $TEST_PACKAGES
@ -138,6 +146,7 @@ jobs:
go: 1.21.x go: 1.21.x
env: env:
- ubuntu-ppa - ubuntu-ppa
- GO111MODULE=on
git: git:
submodules: false # avoid cloning ethereum/tests submodules: false # avoid cloning ethereum/tests
addons: addons:
@ -161,6 +170,7 @@ jobs:
go: 1.21.x go: 1.21.x
env: env:
- azure-purge - azure-purge
- GO111MODULE=on
git: git:
submodules: false # avoid cloning ethereum/tests submodules: false # avoid cloning ethereum/tests
script: script:
@ -172,6 +182,8 @@ jobs:
os: linux os: linux
dist: bionic dist: bionic
go: 1.21.x go: 1.21.x
env:
- GO111MODULE=on
script: script:
- travis_wait 30 go run build/ci.go test -race $TEST_PACKAGES - travis_wait 30 go run build/ci.go test -race $TEST_PACKAGES

View file

@ -6,7 +6,7 @@
GOBIN = ./build/bin GOBIN = ./build/bin
GO ?= latest GO ?= latest
GORUN = go run GORUN = env GO111MODULE=on go run
geth: geth:
$(GORUN) build/ci.go install ./cmd/geth $(GORUN) build/ci.go install ./cmd/geth
@ -23,7 +23,7 @@ lint: ## Run linters.
$(GORUN) build/ci.go lint $(GORUN) build/ci.go lint
clean: clean:
go clean -cache env GO111MODULE=on go clean -cache
rm -fr build/_workspace/pkg/ $(GOBIN)/* rm -fr build/_workspace/pkg/ $(GOBIN)/*
# The devtools target installs tools required for 'go generate'. # The devtools target installs tools required for 'go generate'.