Skip to content

Commit a73224d

Browse files
Merge pull request #43 from hellofresh/use-go-mod
Use go mod instead of dep
2 parents e45f508 + e9e1c1c commit a73224d

File tree

6 files changed

+99
-293
lines changed

6 files changed

+99
-293
lines changed

.travis.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@ addons:
88
postgresql: '10'
99
cache:
1010
directories:
11-
- "$GOPATH/pkg/dep"
1211
- "$HOME/gopath/pkg/mod"
1312
env:
1413
global:
1514
- secure: KONX7893Jxeu3zBnNRWMl0x9DNsriN+RFojuFE28bDBjE2NJKTBeIhWNF4Jnoy7ba9hvE3LB7aGFUETnUR2sxKgNp/yz1Q6Wjk2qFvIPxYB8soOXWnOcRRvRulM2jOpLLJdT4aKewyTGTQfszib/3BD2fWgIgnH0aAvhoV6F/e9Mhtt1ZXLvvRDyDX2q0XkDtjK9tTB8/QOJFz6c9UI/fScYglI+Ob5lx7GwjYg6LHbIaPXt4wrGLXW9/FXOHTI1F6+FuDE08n7EtqkuEqmh3gURQRRyjmX2nDnxUuvSPpbTR6cRHctgwaYSL2gu0321lbXIUv4bFAW14MoQLnI5xKW8nFjuD0Z3DrePr3G96sTombrg2PeI0eM/twW9YgTlHpjt+gkblSriOZ8vVe1UDMZ0OidXSzO9dOk0vDustwvbA+TYP3/e7Tw60wn1NWoEFl38W8F+jB2kBuMON45AT4I5zPQAjZLmEwTgYm4jOahpnvOY3Z6cxqpN+zDNlqllETJCdf+e5bp8xk9vYZtEZ0ML3L7cMMw3IbLg+slE4rIUZuydvk4rC9EXwqPw/089BhCFhpc62GfvlVhDrPJfnHIPhzZ9nyYS1FDBl96gVNze2uFOyaEMACFtevFF4EP0NmUYRhLWPcasdjbhUjUsIiFQVS3CFQODR9FL0SXSM9M=
1615
- POSTGRES_DSN="postgres://postgres@localhost:5432/goengine?sslmode=disable&client_encoding=UTF8"
16+
- GO111MODULE=on
1717

1818
matrix:
1919
include:
2020
- name: "GoLang CI lint"
2121
go: 1.11.x
2222
install:
23-
- dep ensure -v
23+
- go mod vendor
2424
- curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.15.0
2525
before_script: []
2626
script:
@@ -29,11 +29,8 @@ matrix:
2929
allow_failures:
3030
- go: master
3131

32-
before_install:
33-
- curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
34-
3532
install:
36-
- dep ensure -v
33+
- go mod vendor
3734

3835
before_script:
3936
- psql -U postgres -c "CREATE DATABASE goengine ENCODING 'UTF8';"

Gopkg.lock

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

Gopkg.toml

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

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ clean:
3030

3131
deps:
3232
$(call title, "Installing dependencies")
33-
dep ensure -v
33+
go mod vendor
3434

3535
#-----------------------------------------------------------------------------------------------------------------------
3636
# Testing

go.mod

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
module github.com/hellofresh/goengine
2+
3+
go 1.12
4+
5+
require (
6+
github.com/DATA-DOG/go-sqlmock v1.3.0
7+
github.com/golang/mock v1.2.0
8+
github.com/google/uuid v1.0.0
9+
github.com/lib/pq v1.0.0
10+
github.com/mailru/easyjson v0.0.0-20190221075403-6243d8e04c3f
11+
github.com/pkg/errors v0.8.0
12+
github.com/prometheus/client_golang v0.9.4
13+
github.com/sirupsen/logrus v1.2.0
14+
github.com/stretchr/testify v1.3.0
15+
go.uber.org/atomic v1.3.2 // indirect
16+
go.uber.org/multierr v1.1.0 // indirect
17+
go.uber.org/zap v1.9.1
18+
)

0 commit comments

Comments
 (0)