Skip to content

Commit 9d6c4d1

Browse files
authored
Complete update to go 1.13 (#1679)
Changes the image in circleci config and updates vendor. Signed-off-by: Goutham Veeramachaneni <[email protected]>
1 parent e16a10b commit 9d6c4d1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+284
-9773
lines changed

.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: 2.1
33
# https://circleci.com/blog/circleci-hacks-reuse-yaml-in-your-circleci-config-with-yaml/
44
defaults: &defaults
55
docker:
6-
- image: cortexproject/build-image:master-561033f49
6+
- image: cortexproject/build-image:master-114312d34
77
working_directory: /go/src/github.com/cortexproject/cortex
88

99
workflows:
@@ -89,7 +89,7 @@ jobs:
8989
name: Integration Test
9090
command: |
9191
touch build-image/.uptodate
92-
MIGRATIONS_DIR=$(pwd)/cmd/cortex/migrations make BUILD_IMAGE=cortexproject/build-image:1370-pin-protoc-7ae297930 configs-integration-test
92+
MIGRATIONS_DIR=$(pwd)/cmd/cortex/migrations make BUILD_IMAGE=cortexproject/build-image:master-114312d34 configs-integration-test
9393
- run:
9494
name: Load Images
9595
command: ln -s /tmp/images ./images; make BUILD_IN_CONTAINER=false load-images

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,10 @@ configs-integration-test:
145145
/bin/bash -c "go test -v -tags 'netgo integration' -timeout 30s ./pkg/configs/... ./pkg/ruler/..."
146146

147147
mod-check:
148-
GO111MODULE=on GOPROXY=https://proxy.golang.org go mod download
149-
GO111MODULE=on GOPROXY=https://proxy.golang.org go mod verify
150-
GO111MODULE=on GOPROXY=https://proxy.golang.org go mod tidy
151-
GO111MODULE=on GOPROXY=https://proxy.golang.org go mod vendor
148+
GO111MODULE=on go mod download
149+
GO111MODULE=on go mod verify
150+
GO111MODULE=on go mod tidy
151+
GO111MODULE=on go mod vendor
152152
@git diff --exit-code -- go.sum go.mod vendor/
153153

154154
check-protos: clean-protos protos

vendor/github.com/google/btree/btree_mem.go

Lines changed: 0 additions & 76 deletions
This file was deleted.

vendor/github.com/lib/pq/oid/gen.go

Lines changed: 0 additions & 93 deletions
This file was deleted.

vendor/github.com/miekg/dns/duplicate_generate.go

Lines changed: 0 additions & 144 deletions
This file was deleted.

0 commit comments

Comments
 (0)