Skip to content

Commit 5576f48

Browse files
committed
Switch to go modules
1 parent d9a0c70 commit 5576f48

File tree

7 files changed

+194
-265
lines changed

7 files changed

+194
-265
lines changed

.circleci/config.yml

Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@ version: 2
66
defaults: &defaults
77
docker:
88
# specify the version
9-
- image: circleci/golang:1.10
10-
11-
working_directory: /go/src/github.com/itzg/mc-router
12-
9+
- image: circleci/golang:1.12
1310

1411
jobs:
1512
build:
@@ -19,36 +16,22 @@ jobs:
1916

2017
- restore_cache:
2118
keys:
22-
- cache-{{ arch }}-{{ .Branch }}-{{ checksum "glide.lock" }}
19+
- cache-{{ arch }}-{{ .Branch }}-{{ checksum "go.sum" }}
2320
- cache-{{ arch }}-{{ .Branch }}
2421
- cache
2522

26-
- run:
27-
name: Install dependency management
28-
command: make install-dep-mgmt
29-
- run:
30-
name: Install dependencies
31-
command: make vendor
23+
- run: make test
3224

3325
- save_cache:
34-
key: cache-{{ arch }}-{{ .Branch }}-{{ checksum "glide.lock" }}
26+
key: cache-{{ arch }}-{{ .Branch }}-{{ checksum "go.sum" }}
3527
paths:
36-
- vendor
37-
38-
- run: make test
28+
- /go/pkg
3929

4030
release:
4131
<<: *defaults
4232
steps:
4333
- checkout
4434

45-
- run:
46-
name: Install dependency management
47-
command: make install-dep-mgmt
48-
- run:
49-
name: Install dependencies
50-
command: make vendor
51-
5235
- setup_remote_docker
5336
- run: echo $DOCKER_PASSWORD | docker login -u $DOCKER_USER --password-stdin
5437
- run: make release

.goreleaser.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ release:
33
github:
44
owner: itzg
55
name: mc-router
6+
before:
7+
hooks:
8+
- go mod download
69
brew:
710
install: bin.install "mc-router"
811
builds:

Makefile

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
1-
test: vendor
1+
test:
22
go test ./...
33

4-
vendor:
5-
glide install
6-
74
.PHONY: release
8-
release: vendor
9-
curl -sL https://git.io/goreleaser | bash
10-
11-
.PHONY: install-dep-mgmt
12-
install-dep-mgmt:
13-
curl https://glide.sh/get | sh
5+
release:
6+
curl -sL https://git.io/goreleaser | bash

glide.lock

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

glide.yaml

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

go.mod

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
module github.com/itzg/mc-router
2+
3+
require (
4+
github.com/gogo/protobuf v1.2.0 // indirect
5+
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c // indirect
6+
github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf // indirect
7+
github.com/googleapis/gnostic v0.2.0 // indirect
8+
github.com/gorilla/mux v1.7.0
9+
github.com/gregjones/httpcache v0.0.0-20190203031600-7a902570cb17 // indirect
10+
github.com/hashicorp/golang-lru v0.5.0 // indirect
11+
github.com/imdario/mergo v0.3.7 // indirect
12+
github.com/json-iterator/go v1.1.5 // indirect
13+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
14+
github.com/modern-go/reflect2 v1.0.1 // indirect
15+
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
16+
github.com/pkg/errors v0.8.1
17+
github.com/sirupsen/logrus v1.3.0
18+
github.com/spf13/pflag v1.0.3 // indirect
19+
golang.org/x/net v0.0.0-20190206173232-65e2d4e15006 // indirect
20+
golang.org/x/oauth2 v0.0.0-20190130055435-99b60b757ec1 // indirect
21+
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c // indirect
22+
gopkg.in/inf.v0 v0.9.1 // indirect
23+
k8s.io/api v0.0.0-20190208171344-de494049e22a
24+
k8s.io/apimachinery v0.0.0-20190208171202-bf20fabcb825
25+
k8s.io/client-go v10.0.0+incompatible
26+
k8s.io/klog v0.1.0 // indirect
27+
sigs.k8s.io/structured-merge-diff v0.0.0-20190130003954-e5e029740eb8 // indirect
28+
sigs.k8s.io/yaml v1.1.0 // indirect
29+
)

0 commit comments

Comments
 (0)