Skip to content

Commit

Permalink
feat(bazel): update to 2.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
n0izn0iz authored and gfanton committed Dec 20, 2019
1 parent de03dd3 commit 3ec64bd
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 15 deletions.
3 changes: 2 additions & 1 deletion .buildkite/pipeline.yml
Expand Up @@ -124,7 +124,7 @@ steps:
- label: bazel-go
plugins:
- n0izn0iz/docker#v3.5.4:
image: bertytech/bazel:0.29.1-buster-r3
image: bertytech/bazel:2.0.0-buster-r0
propagate-uid-gid: true
workdir: /go/src/berty.tech
environment:
Expand All @@ -137,6 +137,7 @@ steps:
volumes: ["~:/home/buildkite-agent", "~/go/pkg/mod:/go/pkg/mod"]
commands:
- set -x
- export USER=$(id -u)
- bazel --version
- go version
- cd go
Expand Down
2 changes: 1 addition & 1 deletion go/WORKSPACE
Expand Up @@ -10,7 +10,7 @@ berty_go_repositories()

load("@build_bazel_rules_nodejs//:index.bzl", "check_bazel_version")

check_bazel_version("0.29.1")
check_bazel_version("2.0.0")

# config go berty

Expand Down
2 changes: 1 addition & 1 deletion go/config.bzl
Expand Up @@ -7,7 +7,7 @@ def berty_go_config():

go_rules_dependencies()

go_register_toolchains(go_version = "1.13.4")
go_register_toolchains(go_version = "1.13.5")

# gazelle config

Expand Down
6 changes: 3 additions & 3 deletions go/repositories.bzl
Expand Up @@ -23,10 +23,10 @@ def berty_go_repositories():
http_archive,
name = "io_bazel_rules_go",
urls = [
"https://storage.googleapis.com/bazel-mirror/github.com/bazelbuild/rules_go/releases/download/v0.20.2/rules_go-v0.20.2.tar.gz",
"https://github.com/bazelbuild/rules_go/releases/download/v0.20.2/rules_go-v0.20.2.tar.gz",
"https://storage.googleapis.com/bazel-mirror/github.com/bazelbuild/rules_go/releases/download/v0.20.3/rules_go-v0.20.3.tar.gz",
"https://github.com/bazelbuild/rules_go/releases/download/v0.20.3/rules_go-v0.20.3.tar.gz",
],
sha256 = "b9aa86ec08a292b97ec4591cf578e020b35f98e12173bbd4a921f84f583aebd9",
sha256 = "e88471aea3a3a4f19ec1310a55ba94772d087e9ce46e41ae38ecebe17935de7b",
patches = [
"@berty_go//:third_party/io_bazel_rules_go/PR-2181-rebase-0.20.1.patch",
],
Expand Down
10 changes: 4 additions & 6 deletions tool/docker-bazel/Dockerfile
Expand Up @@ -21,15 +21,13 @@ 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/2.0.0/bazel-2.0.0-installer-linux-x86_64.sh \
/tmp/bazel-2.0.0-installer-linux-x86_64.sh

RUN chmod +x /tmp/bazel-0.29.1-installer-linux-x86_64.sh
RUN chmod +x /tmp/bazel-2.0.0-installer-linux-x86_64.sh

RUN /tmp/bazel-0.29.1-installer-linux-x86_64.sh --user
RUN /tmp/bazel-2.0.0-installer-linux-x86_64.sh --user

RUN chmod o+x /root

ENV PATH="${PATH}:/root/bin"

ENV USER=root
6 changes: 3 additions & 3 deletions tool/docker-bazel/Makefile
@@ -1,10 +1,10 @@
IMAGE ?= bertytech/bazel
VERSION ?= 0.29.1-buster-r4
VERSION ?= 2.0.0-buster-r0

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

publish: build
#docker tag $(IMAGE):$(VERSION) $(IMAGE):latest
docker tag $(IMAGE):$(VERSION) $(IMAGE):latest
docker push $(IMAGE):$(VERSION)
#docker push $(IMAGE):latest
docker push $(IMAGE):latest
Empty file removed tool/docker-bazel/file
Empty file.

0 comments on commit 3ec64bd

Please sign in to comment.