From d58175a84c43e9f8b5bf5b038989eb60f8a1937f Mon Sep 17 00:00:00 2001 From: Mykola Dzham Date: Thu, 1 Sep 2022 10:54:47 +0000 Subject: [PATCH] Upgrade bazel to 5.3.0, bazelisk to 1.12.2 --- .bazelversion | 2 +- gitlab-ci/config/00--child-pipeline-root-protected.yml | 2 +- gitlab-ci/config/00--child-pipeline-root-unprotected.yml | 4 ++-- gitlab-ci/config/00--common.yml | 4 ++-- gitlab-ci/config/30--cargo-build--child-pipeline.yml | 6 +++--- gitlab-ci/docker/Dockerfile | 2 +- gitlab-ci/docker/Dockerfile.src | 4 ++-- gitlab-ci/docker/TAG | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.bazelversion b/.bazelversion index 91ff57278e3..03f488b076a 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -5.2.0 +5.3.0 diff --git a/gitlab-ci/config/00--child-pipeline-root-protected.yml b/gitlab-ci/config/00--child-pipeline-root-protected.yml index 6e5c158f7b1..670ec11c8f8 100644 --- a/gitlab-ci/config/00--child-pipeline-root-protected.yml +++ b/gitlab-ci/config/00--child-pipeline-root-protected.yml @@ -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: diff --git a/gitlab-ci/config/00--child-pipeline-root-unprotected.yml b/gitlab-ci/config/00--child-pipeline-root-unprotected.yml index dc4e5627005..8baacddf6d6 100644 --- a/gitlab-ci/config/00--child-pipeline-root-unprotected.yml +++ b/gitlab-ci/config/00--child-pipeline-root-unprotected.yml @@ -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 diff --git a/gitlab-ci/config/00--common.yml b/gitlab-ci/config/00--common.yml index 8c8b123f427..5ac0a201057 100644 --- a/gitlab-ci/config/00--common.yml +++ b/gitlab-ci/config/00--common.yml @@ -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 @@ -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" diff --git a/gitlab-ci/config/30--cargo-build--child-pipeline.yml b/gitlab-ci/config/30--cargo-build--child-pipeline.yml index e614e3be7fd..82f54f1d92e 100644 --- a/gitlab-ci/config/30--cargo-build--child-pipeline.yml +++ b/gitlab-ci/config/30--cargo-build--child-pipeline.yml @@ -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: @@ -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}/*" @@ -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 diff --git a/gitlab-ci/docker/Dockerfile b/gitlab-ci/docker/Dockerfile index 2ba5b12c7ff..2af2b3af963 100644 --- a/gitlab-ci/docker/Dockerfile +++ b/gitlab-ci/docker/Dockerfile @@ -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 && \ diff --git a/gitlab-ci/docker/Dockerfile.src b/gitlab-ci/docker/Dockerfile.src index 710c5b20652..6413d1b3279 100644 --- a/gitlab-ci/docker/Dockerfile.src +++ b/gitlab-ci/docker/Dockerfile.src @@ -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 diff --git a/gitlab-ci/docker/TAG b/gitlab-ci/docker/TAG index 955a2ea5714..f344daf669f 100644 --- a/gitlab-ci/docker/TAG +++ b/gitlab-ci/docker/TAG @@ -1 +1 @@ -89320234dde8878586869729b3427dc8281fad2aba656f46307c705e488fb652 +7e58156e2f6210633b9c55a5ddfc66416ffbfd72b113ac912dd1894add0c85fa