Merge pull request #2773 from moul/dev/moul/protoc26

chore: use go1.15 in bertytech/protoc:26
berty · Nov 20, 2020 · 25b0b13 · 25b0b13
2 parents 615b50e + b066e3c
commit 25b0b13
Show file tree

Hide file tree

Showing 12 changed files with 243 additions and 106 deletions.
diff --git a/.github/workflows/protobuf.yml b/.github/workflows/protobuf.yml
@@ -67,7 +67,7 @@ on:
 jobs:
   gen-go-and-docs:
     runs-on: ubuntu-latest
-    container: bertytech/protoc:25
+    container: bertytech/protoc:26
     steps:
       - name: checkout
         uses: actions/checkout@v2
@@ -127,7 +127,7 @@ jobs:
       #    file: docs/.tmp/openapi/bertymessenger.swagger.json
   gen-js:
     runs-on: ubuntu-latest
-    container: bertytech/protoc:25
+    container: bertytech/protoc:26
     steps:
       - uses: actions/checkout@v2
 

diff --git a/docs/Makefile b/docs/Makefile
@@ -29,7 +29,7 @@ $(gen_sum): $(gen_src)
 	    --workdir="/go/src/berty.tech/berty/docs" \
 	    --entrypoint="sh" \
 	    --rm \
-	    bertytech/protoc:25 \
+	    bertytech/protoc:26 \
 	    -xec 'make generate_local' \
 	)
 protoc_opts := -I ../api:`go list -m -mod=mod -f {{.Dir}} github.com/grpc-ecosystem/grpc-gateway`/third_party/googleapis:`go list -m -mod=mod -f {{.Dir}} github.com/gogo/protobuf`:/protobuf

diff --git a/docs/gen.sum b/docs/gen.sum
diff --git a/docs/messenger/bertymessenger.swagger.json b/docs/messenger/bertymessenger.swagger.json