Skip to content

Commit e43e3cc

Browse files
authored
Set go version to 1.14, to enable vendor builds by default. (#2749)
* Set go version to 1.14. That enables vendoring by defualt. Signed-off-by: Peter Štibraný <[email protected]> * Don't complain about inconsistent vendor during testing. Signed-off-by: Peter Štibraný <[email protected]> * Fix vendor issues by revendoring everything after go get. Signed-off-by: Peter Štibraný <[email protected]> * Removed support for unused -go-get option. Signed-off-by: Peter Štibraný <[email protected]>
1 parent b64dabe commit e43e3cc

File tree

3 files changed

+72
-14
lines changed

3 files changed

+72
-14
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/cortexproject/cortex
22

3-
go 1.13
3+
go 1.14
44

55
require (
66
cloud.google.com/go/bigtable v1.2.0

tools/test

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@ set -e
44

55
DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
66
SLOW=
7-
NO_GO_GET=true
87
TAGS=
98
PARALLEL=
109
RACE="-race -covermode=atomic"
1110
TIMEOUT=5m
1211
VERBOSE=
1312

1413
usage() {
15-
echo "$0 [-slow] [-in-container foo] [-netgo] [-(no-)go-get] [-timeout 1m]"
14+
echo "$0 [-slow] [-in-container foo] [-netgo] [-timeout 1m]"
1615
}
1716

1817
while [ $# -gt 0 ]; do
@@ -29,14 +28,6 @@ while [ $# -gt 0 ]; do
2928
RACE=
3029
shift 1
3130
;;
32-
"-no-go-get")
33-
NO_GO_GET=true
34-
shift 1
35-
;;
36-
"-go-get")
37-
NO_GO_GET=
38-
shift 1
39-
;;
4031
"-netgo")
4132
TAGS="netgo"
4233
shift 1
@@ -102,9 +93,6 @@ PACKAGE_BASE=$(go list -e ./)
10293

10394
run_test() {
10495
local dir=$1
105-
if [ -z "$NO_GO_GET" ]; then
106-
go get -t -tags "${TAGS[@]}" "$dir"
107-
fi
10896

10997
local GO_TEST_ARGS_RUN=("${GO_TEST_ARGS[@]}")
11098
if [ -n "$SLOW" ]; then
@@ -147,6 +135,8 @@ fi
147135

148136
if [ -n "$SLOW" ] && [ -z "$COVERDIR" ]; then
149137
go get github.com/weaveworks/tools/cover
138+
go mod vendor # re-vendor everything
139+
150140
cover "$coverdir"/* >profile.cov
151141
rm -rf "$coverdir"
152142
go tool cover -html=profile.cov -o=coverage.html

0 commit comments

Comments
 (0)