Skip to content
This repository has been archived by the owner on Mar 30, 2023. It is now read-only.

Commit

Permalink
Update go to 1.13 and update all dependencies (#125)
Browse files Browse the repository at this point in the history
* Update go to 1.13 and update all dependencies

Includes updated to depend on etcd v3.3.15 instead of v3.3.18

* Output version of go used to build binary
  • Loading branch information
JohnGarbutt authored Jan 15, 2020
1 parent 6ceef9e commit c1ab6c6
Show file tree
Hide file tree
Showing 5 changed files with 88 additions and 201 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: 2
jobs:
build:
docker:
- image: circleci/golang:1.12
- image: circleci/golang:1.13
working_directory: ~/data-acc
steps:
- checkout
Expand Down
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ clean:
tar: clean buildlocal
tar -cvzf ./bin/data-acc-`git describe --tag --dirty`.tgz ./bin/dacd ./bin/dacctl ./fs-ansible ./tools/*.sh
sha256sum ./bin/data-acc-`git describe --tag --dirty`.tgz > ./bin/data-acc-`git describe --tag`.tgz.sha256
go version > ./bin/data-acc-`git describe --tag`.go-version

dockercmd=docker run --rm -it -v ~/go:/go -w /go/src/github.com/RSE-Cambridge/data-acc golang:1.11

Expand Down
2 changes: 2 additions & 0 deletions build/rebuild_mocks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

set -eux

go get github.com/golang/mock/mockgen

echo "Regenerate mocks:"

mkdir -p internal/pkg/mocks
Expand Down
62 changes: 17 additions & 45 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,64 +1,36 @@
module github.com/RSE-Cambridge/data-acc

go 1.12
go 1.13

replace github.com/coreos/go-systemd => github.com/coreos/go-systemd/v22 v22.0.0

require (
cloud.google.com/go v0.44.3 // indirect
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4 // indirect
github.com/coreos/bbolt v1.3.3 // indirect
github.com/coreos/etcd v3.3.15+incompatible
github.com/coreos/etcd v3.3.18+incompatible
github.com/coreos/go-semver v0.3.0 // indirect
github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f // indirect
github.com/coreos/go-systemd v0.0.0-00010101000000-000000000000 // indirect
github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect
github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
github.com/go-kit/kit v0.9.0 // indirect
github.com/go-stack/stack v1.8.0 // indirect
github.com/gogo/protobuf v1.2.1 // indirect
github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6 // indirect
github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7 // indirect
github.com/golang/mock v1.3.1
github.com/google/go-cmp v0.3.1 // indirect
github.com/google/pprof v0.0.0-20190723021845-34ac40c74b70 // indirect
github.com/google/btree v1.0.0 // indirect
github.com/google/uuid v1.1.1
github.com/gorilla/websocket v1.4.1 // indirect
github.com/grpc-ecosystem/go-grpc-middleware v1.0.0 // indirect
github.com/grpc-ecosystem/go-grpc-middleware v1.1.0 // indirect
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
github.com/grpc-ecosystem/grpc-gateway v1.10.0 // indirect
github.com/hashicorp/golang-lru v0.5.3 // indirect
github.com/grpc-ecosystem/grpc-gateway v1.12.1 // indirect
github.com/jonboulle/clockwork v0.1.0 // indirect
github.com/kisielk/errcheck v1.2.0 // indirect
github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
github.com/kr/pty v1.1.8 // indirect
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
github.com/pkg/errors v0.8.1 // indirect
github.com/prometheus/client_golang v1.1.0 // indirect
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 // indirect
github.com/prometheus/common v0.6.0
github.com/prometheus/procfs v0.0.4 // indirect
github.com/rogpeppe/fastuuid v1.2.0 // indirect
github.com/rogpeppe/go-internal v1.3.1 // indirect
github.com/sirupsen/logrus v1.4.2 // indirect
github.com/prometheus/common v0.8.0
github.com/soheilhy/cmux v0.1.4 // indirect
github.com/stretchr/objx v0.2.0 // indirect
github.com/stretchr/testify v1.4.0
github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5 // indirect
github.com/urfave/cli v1.21.0
github.com/urfave/cli v1.22.2
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
go.etcd.io/bbolt v1.3.3 // indirect
go.uber.org/atomic v1.4.0 // indirect
go.uber.org/multierr v1.1.0 // indirect
go.uber.org/zap v1.10.0 // indirect
golang.org/x/crypto v0.0.0-20190829043050-9756ffdc2472 // indirect
golang.org/x/exp v0.0.0-20190829153037-c13cbed26979 // indirect
golang.org/x/image v0.0.0-20190829093649-6ea169446634 // indirect
golang.org/x/mobile v0.0.0-20190826170111-cafc553e1ac5 // indirect
golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297 // indirect
golang.org/x/sys v0.0.0-20190829204830-5fe476d8906b // indirect
golang.org/x/tools v0.0.0-20190829210313-340205e581e5 // indirect
google.golang.org/api v0.9.0 // indirect
google.golang.org/appengine v1.6.2 // indirect
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 // indirect
google.golang.org/grpc v1.23.0 // indirect
gopkg.in/yaml.v2 v2.2.2
honnef.co/go/tools v0.0.1-2019.2.2 // indirect
go.uber.org/zap v1.13.0 // indirect
golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect
google.golang.org/genproto v0.0.0-20200113173426-e1de0a7b01eb // indirect
google.golang.org/grpc v1.26.0 // indirect
gopkg.in/yaml.v2 v2.2.7
sigs.k8s.io/yaml v1.1.0 // indirect
)
Loading

0 comments on commit c1ab6c6

Please sign in to comment.