From e3c7f555540f83517b7f488b9c67af782b19da7d Mon Sep 17 00:00:00 2001 From: Pietro Abate Date: Wed, 23 Oct 2024 15:29:19 +0200 Subject: [PATCH 1/2] packages: fix inconsistencies in .install files --- .../octez-data/debian/octez-zcash-dal-params.install | 2 +- .../packaging/octez-data/debian/octez-zcash-params.install | 2 +- scripts/packaging/octez/debian/octez-experimental.install | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/packaging/octez-data/debian/octez-zcash-dal-params.install b/scripts/packaging/octez-data/debian/octez-zcash-dal-params.install index 21f1957f7d9d..b9626802abd1 100644 --- a/scripts/packaging/octez-data/debian/octez-zcash-dal-params.install +++ b/scripts/packaging/octez-data/debian/octez-zcash-dal-params.install @@ -1 +1 @@ -dal-trusted-setup/* usr/share/dal_trusted_setup +dal-trusted-setup/* /usr/share/dal_trusted_setup diff --git a/scripts/packaging/octez-data/debian/octez-zcash-params.install b/scripts/packaging/octez-data/debian/octez-zcash-params.install index 00defa6bcf43..30e3a462142e 100644 --- a/scripts/packaging/octez-data/debian/octez-zcash-params.install +++ b/scripts/packaging/octez-data/debian/octez-zcash-params.install @@ -1 +1 @@ -zcash-params/* usr/share/zcash-params +zcash-params/* /usr/share/zcash-params diff --git a/scripts/packaging/octez/debian/octez-experimental.install b/scripts/packaging/octez/debian/octez-experimental.install index 6180200f51fe..026108906a97 100644 --- a/scripts/packaging/octez/debian/octez-experimental.install +++ b/scripts/packaging/octez/debian/octez-experimental.install @@ -1,3 +1,3 @@ -binaries/octez-protocol-compiler /usr/bin -binaries/octez-smart-rollup-wasm-debugger /usr/bin -binaries/octez-snoop /usr/bin +binaries/octez-protocol-compiler /usr/bin/ +binaries/octez-smart-rollup-wasm-debugger /usr/bin/ +binaries/octez-snoop /usr/bin/ -- GitLab From 29483a1257db4ebad66a8ded8fd8fcf9ea0617c7 Mon Sep 17 00:00:00 2001 From: Pietro Abate Date: Wed, 23 Oct 2024 15:27:23 +0200 Subject: [PATCH 2/2] packages: remove redundant argument in dockerfile --- .gitlab/ci/pipelines/debian_repository_full.yml | 4 ++-- .gitlab/ci/pipelines/debian_repository_partial.yml | 2 +- .gitlab/ci/pipelines/debian_repository_partial_auto.yml | 2 +- .gitlab/ci/pipelines/non_release_tag.yml | 4 ++-- .gitlab/ci/pipelines/non_release_tag_test.yml | 4 ++-- .gitlab/ci/pipelines/octez_beta_release_tag.yml | 4 ++-- .gitlab/ci/pipelines/octez_release_tag.yml | 4 ++-- .gitlab/ci/pipelines/octez_release_tag_test.yml | 4 ++-- .gitlab/ci/pipelines/schedule_master_test_release.yml | 4 ++-- ci/bin/debian_repository.ml | 5 ++++- debian-deps-build.Dockerfile | 9 +++++---- ...es-dependencies.sh => build-packages-dependencies.sh} | 5 +++-- 12 files changed, 28 insertions(+), 23 deletions(-) rename scripts/ci/{build-debian-packages-dependencies.sh => build-packages-dependencies.sh} (96%) diff --git a/.gitlab/ci/pipelines/debian_repository_full.yml b/.gitlab/ci/pipelines/debian_repository_full.yml index b017238e6882..09e171db129a 100644 --- a/.gitlab/ci/pipelines/debian_repository_full.yml +++ b/.gitlab/ci/pipelines/debian_repository_full.yml @@ -60,7 +60,7 @@ oc.docker-build-debian-dependencies: before_script: - ./scripts/ci/docker_initialize.sh script: - - ./scripts/ci/build-debian-packages-dependencies.sh + - ./scripts/ci/build-packages-dependencies.sh debian-deps-build.Dockerfile services: - docker:${DOCKER_VERSION}-dind variables: @@ -284,7 +284,7 @@ oc.docker-build-ubuntu-dependencies: before_script: - ./scripts/ci/docker_initialize.sh script: - - ./scripts/ci/build-debian-packages-dependencies.sh + - ./scripts/ci/build-packages-dependencies.sh debian-deps-build.Dockerfile services: - docker:${DOCKER_VERSION}-dind variables: diff --git a/.gitlab/ci/pipelines/debian_repository_partial.yml b/.gitlab/ci/pipelines/debian_repository_partial.yml index 6c552e477016..2185e5d821a2 100644 --- a/.gitlab/ci/pipelines/debian_repository_partial.yml +++ b/.gitlab/ci/pipelines/debian_repository_partial.yml @@ -60,7 +60,7 @@ oc.docker-build-debian-dependencies: before_script: - ./scripts/ci/docker_initialize.sh script: - - ./scripts/ci/build-debian-packages-dependencies.sh + - ./scripts/ci/build-packages-dependencies.sh debian-deps-build.Dockerfile services: - docker:${DOCKER_VERSION}-dind variables: diff --git a/.gitlab/ci/pipelines/debian_repository_partial_auto.yml b/.gitlab/ci/pipelines/debian_repository_partial_auto.yml index 38b943ea5571..64a7079daa1c 100644 --- a/.gitlab/ci/pipelines/debian_repository_partial_auto.yml +++ b/.gitlab/ci/pipelines/debian_repository_partial_auto.yml @@ -60,7 +60,7 @@ oc.docker-build-debian-dependencies: before_script: - ./scripts/ci/docker_initialize.sh script: - - ./scripts/ci/build-debian-packages-dependencies.sh + - ./scripts/ci/build-packages-dependencies.sh debian-deps-build.Dockerfile services: - docker:${DOCKER_VERSION}-dind variables: diff --git a/.gitlab/ci/pipelines/non_release_tag.yml b/.gitlab/ci/pipelines/non_release_tag.yml index 29c1d8ed7f92..27cc1cc49654 100644 --- a/.gitlab/ci/pipelines/non_release_tag.yml +++ b/.gitlab/ci/pipelines/non_release_tag.yml @@ -295,7 +295,7 @@ oc.docker-build-debian-dependencies: before_script: - ./scripts/ci/docker_initialize.sh script: - - ./scripts/ci/build-debian-packages-dependencies.sh + - ./scripts/ci/build-packages-dependencies.sh debian-deps-build.Dockerfile services: - docker:${DOCKER_VERSION}-dind variables: @@ -519,7 +519,7 @@ oc.docker-build-ubuntu-dependencies: before_script: - ./scripts/ci/docker_initialize.sh script: - - ./scripts/ci/build-debian-packages-dependencies.sh + - ./scripts/ci/build-packages-dependencies.sh debian-deps-build.Dockerfile services: - docker:${DOCKER_VERSION}-dind variables: diff --git a/.gitlab/ci/pipelines/non_release_tag_test.yml b/.gitlab/ci/pipelines/non_release_tag_test.yml index c1cfbd781c27..83aad8ee5a06 100644 --- a/.gitlab/ci/pipelines/non_release_tag_test.yml +++ b/.gitlab/ci/pipelines/non_release_tag_test.yml @@ -295,7 +295,7 @@ oc.docker-build-debian-dependencies: before_script: - ./scripts/ci/docker_initialize.sh script: - - ./scripts/ci/build-debian-packages-dependencies.sh + - ./scripts/ci/build-packages-dependencies.sh debian-deps-build.Dockerfile services: - docker:${DOCKER_VERSION}-dind variables: @@ -519,7 +519,7 @@ oc.docker-build-ubuntu-dependencies: before_script: - ./scripts/ci/docker_initialize.sh script: - - ./scripts/ci/build-debian-packages-dependencies.sh + - ./scripts/ci/build-packages-dependencies.sh debian-deps-build.Dockerfile services: - docker:${DOCKER_VERSION}-dind variables: diff --git a/.gitlab/ci/pipelines/octez_beta_release_tag.yml b/.gitlab/ci/pipelines/octez_beta_release_tag.yml index ef99ca2864db..0e45ee5e4835 100644 --- a/.gitlab/ci/pipelines/octez_beta_release_tag.yml +++ b/.gitlab/ci/pipelines/octez_beta_release_tag.yml @@ -296,7 +296,7 @@ oc.docker-build-debian-dependencies: before_script: - ./scripts/ci/docker_initialize.sh script: - - ./scripts/ci/build-debian-packages-dependencies.sh + - ./scripts/ci/build-packages-dependencies.sh debian-deps-build.Dockerfile services: - docker:${DOCKER_VERSION}-dind variables: @@ -520,7 +520,7 @@ oc.docker-build-ubuntu-dependencies: before_script: - ./scripts/ci/docker_initialize.sh script: - - ./scripts/ci/build-debian-packages-dependencies.sh + - ./scripts/ci/build-packages-dependencies.sh debian-deps-build.Dockerfile services: - docker:${DOCKER_VERSION}-dind variables: diff --git a/.gitlab/ci/pipelines/octez_release_tag.yml b/.gitlab/ci/pipelines/octez_release_tag.yml index f16da6519145..bd6e4061814b 100644 --- a/.gitlab/ci/pipelines/octez_release_tag.yml +++ b/.gitlab/ci/pipelines/octez_release_tag.yml @@ -297,7 +297,7 @@ oc.docker-build-debian-dependencies: before_script: - ./scripts/ci/docker_initialize.sh script: - - ./scripts/ci/build-debian-packages-dependencies.sh + - ./scripts/ci/build-packages-dependencies.sh debian-deps-build.Dockerfile services: - docker:${DOCKER_VERSION}-dind variables: @@ -521,7 +521,7 @@ oc.docker-build-ubuntu-dependencies: before_script: - ./scripts/ci/docker_initialize.sh script: - - ./scripts/ci/build-debian-packages-dependencies.sh + - ./scripts/ci/build-packages-dependencies.sh debian-deps-build.Dockerfile services: - docker:${DOCKER_VERSION}-dind variables: diff --git a/.gitlab/ci/pipelines/octez_release_tag_test.yml b/.gitlab/ci/pipelines/octez_release_tag_test.yml index bd65f740e2a8..5ea55429420c 100644 --- a/.gitlab/ci/pipelines/octez_release_tag_test.yml +++ b/.gitlab/ci/pipelines/octez_release_tag_test.yml @@ -297,7 +297,7 @@ oc.docker-build-debian-dependencies: before_script: - ./scripts/ci/docker_initialize.sh script: - - ./scripts/ci/build-debian-packages-dependencies.sh + - ./scripts/ci/build-packages-dependencies.sh debian-deps-build.Dockerfile services: - docker:${DOCKER_VERSION}-dind variables: @@ -521,7 +521,7 @@ oc.docker-build-ubuntu-dependencies: before_script: - ./scripts/ci/docker_initialize.sh script: - - ./scripts/ci/build-debian-packages-dependencies.sh + - ./scripts/ci/build-packages-dependencies.sh debian-deps-build.Dockerfile services: - docker:${DOCKER_VERSION}-dind variables: diff --git a/.gitlab/ci/pipelines/schedule_master_test_release.yml b/.gitlab/ci/pipelines/schedule_master_test_release.yml index d6ecab52d5e8..fe8b13f2048e 100644 --- a/.gitlab/ci/pipelines/schedule_master_test_release.yml +++ b/.gitlab/ci/pipelines/schedule_master_test_release.yml @@ -299,7 +299,7 @@ oc.docker-build-debian-dependencies: before_script: - ./scripts/ci/docker_initialize.sh script: - - ./scripts/ci/build-debian-packages-dependencies.sh + - ./scripts/ci/build-packages-dependencies.sh debian-deps-build.Dockerfile services: - docker:${DOCKER_VERSION}-dind variables: @@ -523,7 +523,7 @@ oc.docker-build-ubuntu-dependencies: before_script: - ./scripts/ci/docker_initialize.sh script: - - ./scripts/ci/build-debian-packages-dependencies.sh + - ./scripts/ci/build-packages-dependencies.sh debian-deps-build.Dockerfile services: - docker:${DOCKER_VERSION}-dind variables: diff --git a/ci/bin/debian_repository.ml b/ci/bin/debian_repository.ml index 1de7084df9ed..53453daded31 100644 --- a/ci/bin/debian_repository.ml +++ b/ci/bin/debian_repository.ml @@ -95,7 +95,10 @@ let jobs pipeline_type = ~variables:(variables [("DISTRIBUTION", distribution)]) ~parallel:(Matrix matrix) ~tag:Dynamic - ["./scripts/ci/build-debian-packages-dependencies.sh"] + [ + "./scripts/ci/build-packages-dependencies.sh \ + debian-deps-build.Dockerfile"; + ] in let job_docker_build_debian_dependencies : tezos_job = make_job_docker_build_debian_dependencies diff --git a/debian-deps-build.Dockerfile b/debian-deps-build.Dockerfile index f40fab21fcdb..d897c9d7ac09 100644 --- a/debian-deps-build.Dockerfile +++ b/debian-deps-build.Dockerfile @@ -37,12 +37,14 @@ RUN apt-get update && \ cp "sccache-v0.8.1-$ARCH-unknown-linux-musl/sccache" /usr/local/bin/sccache && \ rm -Rf sccache* +COPY --link scripts/version.sh /root/tezos/scripts/ + #hadolint ignore=SC2154 -ARG RECOMMENDED_RUST_VERSION= -RUN curl -s https://sh.rustup.rs > rustup-init.sh && \ +RUN . /root/tezos/scripts/version.sh && \ + curl -s https://sh.rustup.rs > rustup-init.sh && \ chmod +x rustup-init.sh && \ ./rustup-init.sh --profile minimal \ - --default-toolchain "$RECOMMENDED_RUST_VERSION" -y + --default-toolchain "$recommended_rust_version" -y RUN opam init --bare --disable-sandboxing @@ -52,7 +54,6 @@ RUN opam init --bare --disable-sandboxing COPY --link scripts/install_build_deps.sh /root/tezos/scripts/ COPY --link scripts/install_build_deps.rust.sh /root/tezos/scripts/ COPY --link scripts/install_dal_trusted_setup.sh /root/tezos/scripts/ -COPY --link scripts/version.sh /root/tezos/scripts/ COPY --link Makefile /root/tezos/ COPY --link opam/virtual/octez-deps.opam.locked /root/tezos/opam/virtual/ COPY --link opam /root/tezos/ diff --git a/scripts/ci/build-debian-packages-dependencies.sh b/scripts/ci/build-packages-dependencies.sh similarity index 96% rename from scripts/ci/build-debian-packages-dependencies.sh rename to scripts/ci/build-packages-dependencies.sh index 0caf5ea38fd0..a13f2b826765 100755 --- a/scripts/ci/build-debian-packages-dependencies.sh +++ b/scripts/ci/build-packages-dependencies.sh @@ -4,6 +4,8 @@ set -e +DOCKERFILE=${1:-debian-deps-build.Dockerfile} + . scripts/version.sh # Determine platform based on runner's tags @@ -34,10 +36,9 @@ docker build \ --label "com.tezos.build-job-id"="${CI_JOB_ID}" \ --label "com.tezos.build-job-url"="${CI_JOB_URL}" \ --label "com.tezos.build-tezos-revision"="${CI_COMMIT_SHA}" \ - -f debian-deps-build.Dockerfile \ + -f "$DOCKERFILE" \ --build-arg=BUILDKIT_INLINE_CACHE=1 \ --build-arg IMAGE="$DISTRIBUTION:$RELEASE" \ - --build-arg RECOMMENDED_RUST_VERSION="$recommended_rust_version" \ --cache-from="${DEP_IMAGE}:${ARCHITECTURE}-${CI_COMMIT_REF_SLUG}" \ --cache-from="${DEP_IMAGE_PROTECTED}:master" \ -t "$LOCAL_IMAGE_NAME" \ -- GitLab