Merge pull request #388 from berty/dev/moul/bump-gqlgen

Bump gqlgen@0.6.0
berty · Oct 15, 2018 · 16138be · 16138be
2 parents 88fdc7e + d8d98fd
commit 16138be
Show file tree

Hide file tree

Showing 12 changed files with 11,181 additions and 5,382 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -38,7 +38,7 @@ jobs:
 
   generate:
     docker:
-      - image: bertychat/protoc:v2
+      - image: bertychat/protoc:v3
     working_directory: /go/src/berty.tech
     environment:
       GOPATH: /go

diff --git a/.circleci/docker/Dockerfile.protoc b/.circleci/docker/Dockerfile.protoc
@@ -16,7 +16,7 @@ RUN     go get -u -v \
         github.com/vektah/gorunpkg \
         github.com/spf13/cobra
 
-RUN     cd /go/src/github.com/99designs/gqlgen && git checkout v0.4.4 && go install github.com/99designs/gqlgen
+RUN     cd /go/src/github.com/99designs/gqlgen && git checkout v0.6.0 && go install github.com/99designs/gqlgen
 RUN     rm -f /go/bin/web-editor
 
 FROM    golang:1.11-alpine

diff --git a/core/Makefile b/core/Makefile
@@ -91,7 +91,7 @@ generate: .generated
 		--workdir="/go/src/berty.tech/core" \
 		--entrypoint="sh" \
 		--rm \
-		bertychat/protoc:v2 \
+		bertychat/protoc:v3 \
 		-xec 'make generate_local'
 	touch $@