Skip to content

Commit

Permalink
Merge branch 'levsha/bazel-5.3.0_bazelisk-1.12.2' into 'master'
Browse files Browse the repository at this point in the history
Upgrade bazel to 5.3.0, bazelisk to 1.12.2

This release contains the fix for
bazelbuild/bazel#15271 and therefore fixes
`bazel build //...` on Mac OS.

bazel 5.3.0 release notes: https://blog.bazel.build/2022/08/23/bazel-5.3.html 

See merge request dfinity-lab/public/ic!7362
  • Loading branch information
levsha committed Sep 1, 2022
2 parents c25187a + d58175a commit 9cdb508
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .bazelversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.2.0
5.3.0
2 changes: 1 addition & 1 deletion gitlab-ci/config/00--child-pipeline-root-protected.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ include:
.ubuntu-docker-protected:
image:
# Use the docker image without nix-shell
name: "registry.gitlab.com/dfinity-lab/core/docker/ic-build:89320234dde8878586869729b3427dc8281fad2aba656f46307c705e488fb652"
name: "registry.gitlab.com/dfinity-lab/core/docker/ic-build:7e58156e2f6210633b9c55a5ddfc66416ffbfd72b113ac912dd1894add0c85fa"
extends:
- .ubuntu-nix-docker
tags:
Expand Down
4 changes: 2 additions & 2 deletions gitlab-ci/config/00--child-pipeline-root-unprotected.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ include:
.ubuntu-docker-protected:
image:
# Use the docker image without nix-shell
name: "registry.gitlab.com/dfinity-lab/core/docker/ic-build:89320234dde8878586869729b3427dc8281fad2aba656f46307c705e488fb652"
name: "registry.gitlab.com/dfinity-lab/core/docker/ic-build:7e58156e2f6210633b9c55a5ddfc66416ffbfd72b113ac912dd1894add0c85fa"
extends:
- .ubuntu-nix-docker-pinned-dc

.ubuntu-docker-k8s-protected:
image:
# Use the docker image without nix-shell
name: "registry.gitlab.com/dfinity-lab/core/docker/ic-build:89320234dde8878586869729b3427dc8281fad2aba656f46307c705e488fb652"
name: "registry.gitlab.com/dfinity-lab/core/docker/ic-build:7e58156e2f6210633b9c55a5ddfc66416ffbfd72b113ac912dd1894add0c85fa"
extends:
- .ubuntu-nix-docker-k8s-pinned-dc
4 changes: 2 additions & 2 deletions gitlab-ci/config/00--common.yml
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ after_script:
.ubuntu-docker:
extends: .build-env-base
image:
name: "registry.gitlab.com/dfinity-lab/core/docker/ic-build:89320234dde8878586869729b3427dc8281fad2aba656f46307c705e488fb652"
name: "registry.gitlab.com/dfinity-lab/core/docker/ic-build:7e58156e2f6210633b9c55a5ddfc66416ffbfd72b113ac912dd1894add0c85fa"
tags:
- dfinity
- docker
Expand All @@ -257,7 +257,7 @@ after_script:
# - Build results are stored in non-persisted /cargo_target
# - The container is destroyed and all non-persisted data is dropped, including /cargo_target
image:
name: "registry.gitlab.com/dfinity-lab/core/docker/ic-build-nix:89320234dde8878586869729b3427dc8281fad2aba656f46307c705e488fb652"
name: "registry.gitlab.com/dfinity-lab/core/docker/ic-build-nix:7e58156e2f6210633b9c55a5ddfc66416ffbfd72b113ac912dd1894add0c85fa"
variables:
SCCACHE_DIR: /cache/sccache
RUSTC_WRAPPER: "/usr/bin/sccache-run"
Expand Down
6 changes: 3 additions & 3 deletions gitlab-ci/config/30--cargo-build--child-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ cargo-build-release-linux-native:
- .rules-parent-pipeline-autorun-on-trigger
image:
# Use the docker image without nix-shell
name: "registry.gitlab.com/dfinity-lab/core/docker/ic-build:89320234dde8878586869729b3427dc8281fad2aba656f46307c705e488fb652"
name: "registry.gitlab.com/dfinity-lab/core/docker/ic-build:7e58156e2f6210633b9c55a5ddfc66416ffbfd72b113ac912dd1894add0c85fa"
variables:
ARTIFACT_EXT: ""
artifacts:
Expand Down Expand Up @@ -74,7 +74,7 @@ cargo-build-canisters:
ARTIFACT_EXT: ""
image:
# Use the docker image without nix-shell
name: "registry.gitlab.com/dfinity-lab/core/docker/ic-build:89320234dde8878586869729b3427dc8281fad2aba656f46307c705e488fb652"
name: "registry.gitlab.com/dfinity-lab/core/docker/ic-build:7e58156e2f6210633b9c55a5ddfc66416ffbfd72b113ac912dd1894add0c85fa"
artifacts:
paths:
- "artifacts/canisters${ARTIFACT_EXT}/*"
Expand Down Expand Up @@ -104,7 +104,7 @@ dfx-build-release-linux:
- artifacts/sdk-release/*
image:
# Use the docker image without nix-shell
name: "registry.gitlab.com/dfinity-lab/core/docker/ic-build:89320234dde8878586869729b3427dc8281fad2aba656f46307c705e488fb652"
name: "registry.gitlab.com/dfinity-lab/core/docker/ic-build:7e58156e2f6210633b9c55a5ddfc66416ffbfd72b113ac912dd1894add0c85fa"
variables:
BUILD_COMMAND: ""
CARGO_BUILD_TARGET: x86_64-unknown-linux-gnu
Expand Down
2 changes: 1 addition & 1 deletion gitlab-ci/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ ENV ROCKSDB_INCLUDE_DIR=/usr/include ROCKSDB_LIB_DIR=/usr/lib ROCKSDB_STATIC=1 \
BZ2_INCLUDE_DIR=/usr/include BZ2_LIB_DIR=/usr/lib/x86_64-linux-gnu BZ2_STATIC=1

# Pre-populate the Bazel installation.
RUN USE_BAZEL_VERSION=5.2.0 bazel version
RUN USE_BAZEL_VERSION=5.3.0 bazel version

# Adds the GitHub and GitLab signatures to known_hosts so that `git pull` calls don't require user approval
RUN mkdir --mode=0700 /home/${USER}/.ssh && \
Expand Down
4 changes: 2 additions & 2 deletions gitlab-ci/docker/Dockerfile.src
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ WORKDIR /tmp/rocksdb

RUN apt -y install libjemalloc-dev libsnappy-dev zlib1g-dev libbz2-dev liblz4-dev libzstd-dev

ARG bazelisk_sha=231ec5ca8115e94c75a1f4fbada1a062b48822ca04f21f26e4cb1cd8973cd458
RUN curl -fsSL https://github.com/bazelbuild/bazelisk/releases/download/v1.11.0/bazelisk-linux-amd64 -o /opt/bin/bazel && \
ARG bazelisk_sha=8b739ac23a189b70d51a98041e90ba16f6559d5f991d83bbc031c740f8796310
RUN curl -fsSL https://github.com/bazelbuild/bazelisk/releases/download/v1.12.2/bazelisk-linux-amd64 -o /opt/bin/bazel && \
echo "$bazelisk_sha /opt/bin/bazel" | sha256sum --check && \
chmod 777 /opt/bin/bazel

Expand Down
2 changes: 1 addition & 1 deletion gitlab-ci/docker/TAG
Original file line number Diff line number Diff line change
@@ -1 +1 @@
89320234dde8878586869729b3427dc8281fad2aba656f46307c705e488fb652
7e58156e2f6210633b9c55a5ddfc66416ffbfd72b113ac912dd1894add0c85fa

0 comments on commit 9cdb508

Please sign in to comment.