Skip to content

Commit

Permalink
feat(ci): update ci config for go 1.13
Browse files Browse the repository at this point in the history
  • Loading branch information
gfanton committed Dec 20, 2019
1 parent 7f0ea80 commit df58fb9
Show file tree
Hide file tree
Showing 12 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .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
Expand Down
10 changes: 5 additions & 5 deletions .buildkite/pipeline.yml
Expand Up @@ -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"]
Expand Down Expand Up @@ -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" ]
Expand All @@ -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" ]
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion docs/Makefile
Expand Up @@ -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' \
)

Expand Down
2 changes: 1 addition & 1 deletion docs/gen.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion 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
Expand Down
2 changes: 1 addition & 1 deletion go/Makefile
Expand Up @@ -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 \
)
Expand Down
2 changes: 1 addition & 1 deletion go/gen.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions js/packages/react-native-chat-sdk/Makefile
Expand Up @@ -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

Expand Down
10 changes: 5 additions & 5 deletions 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 \
Expand All @@ -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"
2 changes: 1 addition & 1 deletion 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) .
Expand Down
4 changes: 2 additions & 2 deletions 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
Expand All @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion tool/docker-protoc/Makefile
@@ -1,5 +1,5 @@
IMAGE ?= bertytech/protoc
VERSION ?= 21
VERSION ?= 22

build:
docker build -t $(IMAGE):$(VERSION) .
Expand Down

0 comments on commit df58fb9

Please sign in to comment.