Skip to content

Complete update to go 1.13 #1679

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 18, 2019
Merged

Complete update to go 1.13 #1679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: 2.1
# https://circleci.com/blog/circleci-hacks-reuse-yaml-in-your-circleci-config-with-yaml/
defaults: &defaults
docker:
- image: cortexproject/build-image:master-561033f49
- image: cortexproject/build-image:master-114312d34
working_directory: /go/src/github.com/cortexproject/cortex

workflows:
Expand Down Expand Up @@ -89,7 +89,7 @@ jobs:
name: Integration Test
command: |
touch build-image/.uptodate
MIGRATIONS_DIR=$(pwd)/cmd/cortex/migrations make BUILD_IMAGE=cortexproject/build-image:1370-pin-protoc-7ae297930 configs-integration-test
MIGRATIONS_DIR=$(pwd)/cmd/cortex/migrations make BUILD_IMAGE=cortexproject/build-image:master-114312d34 configs-integration-test
- run:
name: Load Images
command: ln -s /tmp/images ./images; make BUILD_IN_CONTAINER=false load-images
Expand Down
8 changes: 4 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,10 +145,10 @@ configs-integration-test:
/bin/bash -c "go test -v -tags 'netgo integration' -timeout 30s ./pkg/configs/... ./pkg/ruler/..."

mod-check:
GO111MODULE=on GOPROXY=https://proxy.golang.org go mod download
GO111MODULE=on GOPROXY=https://proxy.golang.org go mod verify
GO111MODULE=on GOPROXY=https://proxy.golang.org go mod tidy
GO111MODULE=on GOPROXY=https://proxy.golang.org go mod vendor
GO111MODULE=on go mod download
GO111MODULE=on go mod verify
GO111MODULE=on go mod tidy
GO111MODULE=on go mod vendor
@git diff --exit-code -- go.sum go.mod vendor/

check-protos: clean-protos protos
Expand Down
76 changes: 0 additions & 76 deletions vendor/github.com/google/btree/btree_mem.go
View file
Open in desktop

This file was deleted.

93 changes: 0 additions & 93 deletions vendor/github.com/lib/pq/oid/gen.go
View file
Open in desktop

This file was deleted.

144 changes: 0 additions & 144 deletions vendor/github.com/miekg/dns/duplicate_generate.go
View file
Open in desktop

This file was deleted.

Loading