diff --git a/.buildkite/agent_setup/linux/user/Makefile b/.buildkite/agent_setup/linux/user/Makefile index 832aba1403..f103e394a2 100644 --- a/.buildkite/agent_setup/linux/user/Makefile +++ b/.buildkite/agent_setup/linux/user/Makefile @@ -1,4 +1,4 @@ -AGENT_GO_VERSION=1.12.10 +AGENT_GO_VERSION=1.13.4 AGENT_BAZEL_VERSION=0.29.1 AGENT_GOLANGCILINT_VERSION=1.21.0 AGENT_KEY_TYPE=ed25519 diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index e79e19e67b..630d70ab36 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -9,7 +9,7 @@ steps: - label: go-generate plugins: - n0izn0iz/docker#v3.5.4: - image: bertytech/protoc:21 + image: bertytech/protoc:22 propagate-uid-gid: true workdir: /go/src/berty.tech environment: [ "GO111MODULE=on", "GOPATH=/go"] @@ -46,7 +46,7 @@ steps: - label: js-generate plugins: - n0izn0iz/docker#v3.5.4: - image: bertytech/protoc:21 + image: bertytech/protoc:22 propagate-uid-gid: true workdir: /go/src/berty.tech environment: [ "GO111MODULE=on", "GOPATH=/go", "HOME=/home/buildkite-agent" ] @@ -68,7 +68,7 @@ steps: - label: js-lint plugins: - n0izn0iz/docker#v3.5.4: - image: bertytech/protoc:21 + image: bertytech/protoc:22 propagate-uid-gid: true workdir: /go/src/berty.tech environment: [ "GO111MODULE=on", "GOPATH=/go", "HOME=/home/buildkite-agent" ] @@ -82,8 +82,8 @@ steps: - cd js - make lint - - label: go-build-112 - key: go-build-112 + - label: go-build-113 + key: go-build-113 env: GO111MODULE: "on" agents: diff --git a/docs/Makefile b/docs/Makefile index 9364b83292..87b6b6617d 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -25,7 +25,7 @@ $(GEN_SUM): $(GEN_SRC) --workdir="/go/src/berty.tech/docs" \ --entrypoint="sh" \ --rm \ - bertytech/protoc:21 \ + bertytech/protoc:22 \ -xec 'make generate_local' \ ) diff --git a/docs/gen.sum b/docs/gen.sum index f6caf42d6e..7729b09bae 100644 --- a/docs/gen.sum +++ b/docs/gen.sum @@ -1,3 +1,3 @@ 8c6820a4873b32acb74d0f867ae42739296f68d5 ../api/bertyprotocol.proto a94e93bd575baf9e7d1d10ef2f97b361aa557e38 ../api/errcode.proto -b8a33be1e9956d89b528318db7a7ef85e405920c Makefile +ed902b86019bde9358d5742fb9fccbc9c0e4fa6d Makefile diff --git a/go/Dockerfile b/go/Dockerfile index 1b8da94bc8..9e0faa8d6c 100644 --- a/go/Dockerfile +++ b/go/Dockerfile @@ -1,5 +1,5 @@ # build -FROM golang:1.12-alpine as builder +FROM golang:1.13.4-alpine as builder RUN apk add --no-cache git gcc musl-dev make ENV GO111MODULE=on WORKDIR /go/src/berty.tech/go diff --git a/go/Makefile b/go/Makefile index de78517c0f..fd0754eac8 100644 --- a/go/Makefile +++ b/go/Makefile @@ -202,7 +202,7 @@ $(GEN_SUM): $(GEN_SRC) --workdir="/go/src/berty.tech/go" \ --entrypoint="sh" \ --rm \ - bertytech/protoc:21 \ + bertytech/protoc:22 \ -xec 'make generate_local'; \ $(MAKE) tidy \ ) diff --git a/go/gen.sum b/go/gen.sum index e051dc06f1..6463b484f5 100644 --- a/go/gen.sum +++ b/go/gen.sum @@ -4,4 +4,4 @@ d915a30248e7105cb1290f5798382ccf0bdb935a ../api/go-internal/handshake.proto 9709a68db024f0b73121062e7b07c925d1d3f5c0 ../api/go-internal/protocolmodel.proto e90229dbdbf76864981801538947a192cb62b448 ../api/go-internal/sigchain.proto 013dcdd574cefc0c541688c493133f0d9be39341 ../api/go-internal/store_entry.proto -1aa02bf96a715be2d047b2d056236e4f4a775b84 Makefile +b5550102b6902bb68cf2f879fd1d55f262c583a8 Makefile diff --git a/js/packages/react-native-chat-sdk/Makefile b/js/packages/react-native-chat-sdk/Makefile index 54bf62c232..5fca8b254e 100644 --- a/js/packages/react-native-chat-sdk/Makefile +++ b/js/packages/react-native-chat-sdk/Makefile @@ -12,10 +12,10 @@ AAR := $(PWD)/android/libs/Bridgechat.aar build.sdk: build.sdk.ios build.sdk.android build.sdk.ios: - GO111MODULE=off gomobile bind -o $(FRAMEWORK) -v -target ios berty.tech/go/framework/chatbridge + gomobile bind -o $(FRAMEWORK) -v -target ios berty.tech/go/framework/bpbridge build.sdk.android: - GO111MODULE=off gomobile bind -o $(AAR) -v -target android berty.tech/go/framework/chatbridge + gomobile bind -o $(AAR) -v -target android berty.tech/go/framework/bpbridge bazel.build.sdk: bazel.build.sdk.ios bazel.build.sdk.android diff --git a/tool/docker-bazel/Dockerfile b/tool/docker-bazel/Dockerfile index e2e7bcaa28..cdd4016193 100644 --- a/tool/docker-bazel/Dockerfile +++ b/tool/docker-bazel/Dockerfile @@ -1,7 +1,7 @@ # https://docs.bazel.build/versions/master/install-ubuntu.html # We need go because we use vendored dependencies -FROM golang:1.12.10-buster +FROM golang:1.13.4-buster RUN apt-get update \ && apt-get install -y \ @@ -21,11 +21,11 @@ RUN apt-get update \ # git is needed by circleci # the rest is bazel dependencies -ADD https://github.com/bazelbuild/bazel/releases/download/0.29.1/bazel-0.29.1-installer-linux-x86_64.sh \ - /tmp/bazel-0.29.1-installer-linux-x86_64.sh +ADD https://github.com/bazelbuild/bazel/releases/download/1.1.0/bazel-1.1.0-installer-linux-x86_64.sh \ + /tmp/bazel-1.1.0-installer-linux-x86_64.sh -RUN chmod +x /tmp/bazel-0.29.1-installer-linux-x86_64.sh +RUN chmod +x /tmp/bazel-1.1.0-installer-linux-x86_64.sh -RUN /tmp/bazel-0.29.1-installer-linux-x86_64.sh --user +RUN /tmp/bazel-1.1.0-installer-linux-x86_64.sh --user ENV PATH="${PATH}:/root/bin" diff --git a/tool/docker-bazel/Makefile b/tool/docker-bazel/Makefile index 1d5d4891af..cc1b33a35c 100644 --- a/tool/docker-bazel/Makefile +++ b/tool/docker-bazel/Makefile @@ -1,5 +1,5 @@ IMAGE ?= bertytech/bazel -VERSION ?= 0.29.1-buster-r0 +VERSION ?= 1.1.0-buster-r0 build: docker build -t $(IMAGE):$(VERSION) . diff --git a/tool/docker-protoc/Dockerfile b/tool/docker-protoc/Dockerfile index 6037225cab..b74696d9ce 100644 --- a/tool/docker-protoc/Dockerfile +++ b/tool/docker-protoc/Dockerfile @@ -1,7 +1,7 @@ FROM moul/protoc-gen-gotemplate:latest as pgg # build image -FROM golang:1.12-alpine as builder +FROM golang:1.13-alpine as builder # install deps RUN apk --no-cache add make git go rsync libc-dev openssh docker npm # install compilers @@ -25,7 +25,7 @@ RUN go get -d github.com/envoyproxy/protoc-gen-validate \ && make -C $GOPATH/src/github.com/envoyproxy/protoc-gen-validate build # runtime -FROM golang:1.12-alpine +FROM golang:1.13-alpine RUN apk --no-cache add git openssh make protobuf gcc libc-dev nodejs-npm yarn sudo perl-utils \ && mkdir -p /.cache/go-build \ && chmod -R 777 /.cache \ diff --git a/tool/docker-protoc/Makefile b/tool/docker-protoc/Makefile index d51fd9292c..ed94815fa8 100644 --- a/tool/docker-protoc/Makefile +++ b/tool/docker-protoc/Makefile @@ -1,5 +1,5 @@ IMAGE ?= bertytech/protoc -VERSION ?= 21 +VERSION ?= 22 build: docker build -t $(IMAGE):$(VERSION) .