Skip to content

Commit 482d451

Browse files
ferhatelmask8s-ci-robot
authored andcommitted
Drop GO111MODULE env variable (#396)
* Extract env drop changes * Add versions to deps
1 parent b20e953 commit 482d451

File tree

6 files changed

+15
-18
lines changed

6 files changed

+15
-18
lines changed

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ after_success:
2424
- bash <(curl -s https://codecov.io/bash)
2525
env:
2626
global:
27-
- GO111MODULE=on
2827
- secure: Ly5oLE9sC7NDvwyZEzOi8gPeHdu3NTP2OuDa8BOUngAanXhaEInzBJ+Pod+TIKFzpope4/z8idMN3rZfPV5LcXzhufk82LSpYlGhZgFDYajvv3eNN20arZQf4kjohd5U2aY1XrYgrgBbodv7dCLnitxotO65tTzQN5xh6evwW6Ji2Em7t42kvz9VHj2nptWKsciQEr6KNb2xDJ7PSvFKdPKq0q3Vuy7PFToZvNbsk+FBLSjYpAHG1KrlyX/WiM1mLu7jCJ4yuPx4n9+CM5Zzycbc/6mrs8ZiR+myyaCMzh6pEltdR0vzSlFIl2TJvUwzTUyTXcZsQ/ENa1ZdOkQwI4jpV3IDTQ6AlMRtBSbL5/uSOvHYs1HBYTbJJeZLiMjru9SM6D9AUW9HRr0JQGeQFsPE/4mzl39Xgl+3GE4+6sfNiaurpvgNArQNBAs2nZ0V3myiDoSG/sAL/2YzXHiG0HVhVk65P33d9SevJjBJRTobhRf4Lt0lT2IO6XF/4kQIvMnaCPQRS1X5tMIHFeTzn1dwrFiZqd1Sbwq5cd8H25nt1XnXsCTgRegJPNUxqRHnDpR5M3HRiW+TmjJIte7Y6exCihonM3afj3rsu3Q/ePwj7ckzgq8CP2yJ//Sxu4FH65LGQ/2bHJUneKL33Uq1W68c+qtKWMGLB4LNRGJVZkc=
2928
- secure: o6ZTdC1H4elXUrqt8XFfV7zuN9mWjQcV5iMicyG7TU/Fn8HIOluzRYPNgmdtuUpLYaQ7KD1t79+QNwuWtQOOHO/eQJ2/LCwO6cSVfxa6sM560r6qOtXraJugq0sCjOY8mNcwo7toY8vtf8yHa1an4L8CSm0SkH0h2EaBE0SE+Vfmb0T0RD/5f2i0Ni8Vn9QLe2P32CRT8VWhFNs+rqj1VwpspDjwa/X+R44RBgLmf61bZQpW5bKauLTR/JrXejppkSXRRqYFDokYTbAVOZbTacwqj7b4D+H6tUb8PaG6wMu5GLe1/rLwREn49cWA3LLX/U7wcUqbIW9jYYFRjt4Cs4YFZXIsaqhAcBcitajFXiZsOdYgHnIHNR4C86oH/dM5UjVSXcpuAw8xcJ4AAEaF3EE3C+bfWZZBHbmfdF1mDbezuTKGynzsQs6i9tlOlrgL9KVsj4YThPqk8Mfa3UOHSG6dOKVqxECPb5voSzKQvRyrzPVjONgmuHf4r/7E8ur1hsXuZGnaVphWTG+fPX4Sdiuo2kn1pOCLt1C8aXqsDpKcnzBjm1yeV8m7jIOBDhPm0mrGHjiCix7NqgxUPuAwLC1zIAXIKyAIpJzig+WlQC6gFu/7zlm0qrowxLImX4seb4rWp90OFcutek0NEVy1BO2LNn4TspaeTWkqD9vR4yQ=
3029
deploy:

hack/install-gox.sh

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,10 @@ cleanup() {
2424
trap cleanup EXIT
2525

2626
install_gox() {
27-
gobin="$(go env GOPATH)/bin"
2827
cd "${scratch_dir}"
29-
env GOPATH="${scratch_dir}" \
30-
GO111MODULE=off \
31-
GOBIN="${gobin}" \
32-
go get github.com/mitchellh/gox
28+
go mod init foo
29+
go get github.com/mitchellh/[email protected]
30+
cd -
3331
}
3432

3533
ensure_gox() {

hack/make-binaries.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ git_rev="${SHORT_SHA:-$(git rev-parse --short HEAD)}"
3737
git_tag="${TAG_NAME:-$(git describe --tags --dirty --always)}"
3838
echo >&2 "(Stamping with git tag=${git_tag} rev=${git_rev})"
3939

40-
env GO111MODULE=on CGO_ENABLED=0 gox -osarch="${OSARCH:-$supported_platforms}" \
40+
env CGO_ENABLED=0 gox -osarch="${OSARCH:-$supported_platforms}" \
4141
-tags netgo \
4242
-mod readonly \
4343
-ldflags="-w -X ${version_pkg}.gitCommit=${git_rev} \

hack/run-integration-tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,4 @@ fi
4646
KREW_BINARY="${krew_binary_realpath}"
4747
export KREW_BINARY
4848

49-
GO111MODULE=on go test sigs.k8s.io/krew/integration_test
49+
go test sigs.k8s.io/krew/integration_test

hack/run-lint.sh

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,16 @@ if ! [[ -x "$gopath/bin/golangci-lint" ]]; then
2727
fi
2828

2929
# configured by .golangci.yml
30-
GO111MODULE=on "$gopath/bin/golangci-lint" run
30+
"$gopath/bin/golangci-lint" run
3131

3232
install_impi() {
3333
impi_dir="$(mktemp -d)"
3434
trap 'rm -rf -- ${impi_dir}' EXIT
3535

36-
GOPATH="${impi_dir}" \
37-
GO111MODULE=off \
38-
GOBIN="${gopath}/bin" \
39-
go get github.com/pavius/impi/cmd/impi
36+
cd "${impi_dir}"
37+
go mod init foo
38+
go get github.com/pavius/impi/cmd/impi@c1cbdcb
39+
cd -
4040
}
4141

4242
# install impi that ensures import grouping is done consistently
@@ -51,10 +51,10 @@ install_shfmt() {
5151
shfmt_dir="$(mktemp -d)"
5252
trap 'rm -rf -- ${shfmt_dir}' EXIT
5353

54-
GOPATH="${shfmt_dir}" \
55-
GO111MODULE=off \
56-
GOBIN="${gopath}/bin" \
57-
go get mvdan.cc/sh/cmd/shfmt
54+
cd "${shfmt_dir}"
55+
go mod init foo
56+
go get mvdan.cc/sh/cmd/[email protected]
57+
cd -
5858
}
5959

6060
# install shfmt that ensures consistent format in shell scripts

hack/run-tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ print_with_color "$color_blue" 'Running gofmt'
4444
"$SCRIPTDIR"/verify-gofmt.sh
4545

4646
print_with_color "$color_blue" 'Running tests'
47-
GO111MODULE=on go test -short -race sigs.k8s.io/krew/...
47+
go test -short -race sigs.k8s.io/krew/...
4848

4949
print_with_color "$color_blue" 'Running linter'
5050
"$SCRIPTDIR"/run-lint.sh

0 commit comments

Comments
 (0)