From 2e9ce3e8aba3a05c7c736143195a97a43110b3fd Mon Sep 17 00:00:00 2001 From: Pietro Abate Date: Mon, 29 Apr 2024 11:43:17 +0200 Subject: [PATCH] packaging/ciao: refactor build dependencies scripts for rpm and deb --- .../ci/jobs/build/bin_packages_deb_dependencies.sh | 9 +++++++++ ...kages_rpm.sh => bin_packages_rpm_dependencies.sh} | 0 .gitlab/ci/pipelines/before_merging.yml | 8 ++------ .gitlab/ci/pipelines/non_release_tag.yml | 8 ++------ .gitlab/ci/pipelines/non_release_tag_test.yml | 8 ++------ .gitlab/ci/pipelines/octez_beta_release_tag.yml | 8 ++------ .gitlab/ci/pipelines/octez_release_tag.yml | 8 ++------ .gitlab/ci/pipelines/octez_release_tag_test.yml | 8 ++------ .gitlab/ci/pipelines/schedule_extended_test.yml | 8 ++------ ci/bin/common.ml | 12 ++---------- 10 files changed, 25 insertions(+), 52 deletions(-) create mode 100755 .gitlab/ci/jobs/build/bin_packages_deb_dependencies.sh rename .gitlab/ci/jobs/build/{bin_packages_rpm.sh => bin_packages_rpm_dependencies.sh} (100%) diff --git a/.gitlab/ci/jobs/build/bin_packages_deb_dependencies.sh b/.gitlab/ci/jobs/build/bin_packages_deb_dependencies.sh new file mode 100755 index 000000000000..1ad51685c769 --- /dev/null +++ b/.gitlab/ci/jobs/build/bin_packages_deb_dependencies.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +export DEBIAN_FRONTEND=noninteractive + +apt update +apt-get install -y rsync git m4 build-essential patch unzip wget \ + opam jq bc autoconf cmake libev-dev libffi-dev libgmp-dev \ + libhidapi-dev pkg-config zlib1g-dev libprotobuf-dev \ + protobuf-compiler libsqlite3-dev diff --git a/.gitlab/ci/jobs/build/bin_packages_rpm.sh b/.gitlab/ci/jobs/build/bin_packages_rpm_dependencies.sh similarity index 100% rename from .gitlab/ci/jobs/build/bin_packages_rpm.sh rename to .gitlab/ci/jobs/build/bin_packages_rpm_dependencies.sh diff --git a/.gitlab/ci/pipelines/before_merging.yml b/.gitlab/ci/pipelines/before_merging.yml index 522f40b91c58..9600ed1a4e45 100644 --- a/.gitlab/ci/pipelines/before_merging.yml +++ b/.gitlab/ci/pipelines/before_merging.yml @@ -8490,11 +8490,7 @@ oc.build:dpkg:amd64: dependencies: [] before_script: - . ./scripts/version.sh - - export DEBIAN_FRONTEND=noninteractive - - apt update - - apt-get install -y rsync git m4 build-essential patch unzip wget opam jq bc autoconf - cmake libev-dev libffi-dev libgmp-dev libhidapi-dev pkg-config zlib1g-dev libprotobuf-dev - protobuf-compiler libsqlite3-dev jq + - .gitlab/ci/jobs/build/bin_packages_deb_dependencies.sh script: - wget https://sh.rustup.rs/rustup-init.sh - chmod +x rustup-init.sh @@ -8540,7 +8536,7 @@ oc.build:rpm:amd64: dependencies: [] before_script: - . ./scripts/version.sh - - .gitlab/ci/jobs/build/bin_packages_rpm.sh + - .gitlab/ci/jobs/build/bin_packages_rpm_dependencies.sh script: - wget https://sh.rustup.rs/rustup-init.sh - chmod +x rustup-init.sh diff --git a/.gitlab/ci/pipelines/non_release_tag.yml b/.gitlab/ci/pipelines/non_release_tag.yml index a91d69023bd4..6e11fd9f4746 100644 --- a/.gitlab/ci/pipelines/non_release_tag.yml +++ b/.gitlab/ci/pipelines/non_release_tag.yml @@ -91,11 +91,7 @@ oc.build:dpkg:amd64: dependencies: [] before_script: - . ./scripts/version.sh - - export DEBIAN_FRONTEND=noninteractive - - apt update - - apt-get install -y rsync git m4 build-essential patch unzip wget opam jq bc autoconf - cmake libev-dev libffi-dev libgmp-dev libhidapi-dev pkg-config zlib1g-dev libprotobuf-dev - protobuf-compiler libsqlite3-dev jq + - .gitlab/ci/jobs/build/bin_packages_deb_dependencies.sh script: - wget https://sh.rustup.rs/rustup-init.sh - chmod +x rustup-init.sh @@ -138,7 +134,7 @@ oc.build:rpm:amd64: dependencies: [] before_script: - . ./scripts/version.sh - - .gitlab/ci/jobs/build/bin_packages_rpm.sh + - .gitlab/ci/jobs/build/bin_packages_rpm_dependencies.sh script: - wget https://sh.rustup.rs/rustup-init.sh - chmod +x rustup-init.sh diff --git a/.gitlab/ci/pipelines/non_release_tag_test.yml b/.gitlab/ci/pipelines/non_release_tag_test.yml index 52563f4a1ed9..14f322dbd679 100644 --- a/.gitlab/ci/pipelines/non_release_tag_test.yml +++ b/.gitlab/ci/pipelines/non_release_tag_test.yml @@ -91,11 +91,7 @@ oc.build:dpkg:amd64: dependencies: [] before_script: - . ./scripts/version.sh - - export DEBIAN_FRONTEND=noninteractive - - apt update - - apt-get install -y rsync git m4 build-essential patch unzip wget opam jq bc autoconf - cmake libev-dev libffi-dev libgmp-dev libhidapi-dev pkg-config zlib1g-dev libprotobuf-dev - protobuf-compiler libsqlite3-dev jq + - .gitlab/ci/jobs/build/bin_packages_deb_dependencies.sh script: - wget https://sh.rustup.rs/rustup-init.sh - chmod +x rustup-init.sh @@ -138,7 +134,7 @@ oc.build:rpm:amd64: dependencies: [] before_script: - . ./scripts/version.sh - - .gitlab/ci/jobs/build/bin_packages_rpm.sh + - .gitlab/ci/jobs/build/bin_packages_rpm_dependencies.sh script: - wget https://sh.rustup.rs/rustup-init.sh - chmod +x rustup-init.sh diff --git a/.gitlab/ci/pipelines/octez_beta_release_tag.yml b/.gitlab/ci/pipelines/octez_beta_release_tag.yml index 36aa3df5cccb..faf14c243bb1 100644 --- a/.gitlab/ci/pipelines/octez_beta_release_tag.yml +++ b/.gitlab/ci/pipelines/octez_beta_release_tag.yml @@ -91,11 +91,7 @@ oc.build:dpkg:amd64: dependencies: [] before_script: - . ./scripts/version.sh - - export DEBIAN_FRONTEND=noninteractive - - apt update - - apt-get install -y rsync git m4 build-essential patch unzip wget opam jq bc autoconf - cmake libev-dev libffi-dev libgmp-dev libhidapi-dev pkg-config zlib1g-dev libprotobuf-dev - protobuf-compiler libsqlite3-dev jq + - .gitlab/ci/jobs/build/bin_packages_deb_dependencies.sh script: - wget https://sh.rustup.rs/rustup-init.sh - chmod +x rustup-init.sh @@ -138,7 +134,7 @@ oc.build:rpm:amd64: dependencies: [] before_script: - . ./scripts/version.sh - - .gitlab/ci/jobs/build/bin_packages_rpm.sh + - .gitlab/ci/jobs/build/bin_packages_rpm_dependencies.sh script: - wget https://sh.rustup.rs/rustup-init.sh - chmod +x rustup-init.sh diff --git a/.gitlab/ci/pipelines/octez_release_tag.yml b/.gitlab/ci/pipelines/octez_release_tag.yml index 9a8213f0178f..c6cc9e34b9bb 100644 --- a/.gitlab/ci/pipelines/octez_release_tag.yml +++ b/.gitlab/ci/pipelines/octez_release_tag.yml @@ -92,11 +92,7 @@ oc.build:dpkg:amd64: dependencies: [] before_script: - . ./scripts/version.sh - - export DEBIAN_FRONTEND=noninteractive - - apt update - - apt-get install -y rsync git m4 build-essential patch unzip wget opam jq bc autoconf - cmake libev-dev libffi-dev libgmp-dev libhidapi-dev pkg-config zlib1g-dev libprotobuf-dev - protobuf-compiler libsqlite3-dev jq + - .gitlab/ci/jobs/build/bin_packages_deb_dependencies.sh script: - wget https://sh.rustup.rs/rustup-init.sh - chmod +x rustup-init.sh @@ -139,7 +135,7 @@ oc.build:rpm:amd64: dependencies: [] before_script: - . ./scripts/version.sh - - .gitlab/ci/jobs/build/bin_packages_rpm.sh + - .gitlab/ci/jobs/build/bin_packages_rpm_dependencies.sh script: - wget https://sh.rustup.rs/rustup-init.sh - chmod +x rustup-init.sh diff --git a/.gitlab/ci/pipelines/octez_release_tag_test.yml b/.gitlab/ci/pipelines/octez_release_tag_test.yml index 6156dfe1cd0e..7c9dde5e13fa 100644 --- a/.gitlab/ci/pipelines/octez_release_tag_test.yml +++ b/.gitlab/ci/pipelines/octez_release_tag_test.yml @@ -91,11 +91,7 @@ oc.build:dpkg:amd64: dependencies: [] before_script: - . ./scripts/version.sh - - export DEBIAN_FRONTEND=noninteractive - - apt update - - apt-get install -y rsync git m4 build-essential patch unzip wget opam jq bc autoconf - cmake libev-dev libffi-dev libgmp-dev libhidapi-dev pkg-config zlib1g-dev libprotobuf-dev - protobuf-compiler libsqlite3-dev jq + - .gitlab/ci/jobs/build/bin_packages_deb_dependencies.sh script: - wget https://sh.rustup.rs/rustup-init.sh - chmod +x rustup-init.sh @@ -138,7 +134,7 @@ oc.build:rpm:amd64: dependencies: [] before_script: - . ./scripts/version.sh - - .gitlab/ci/jobs/build/bin_packages_rpm.sh + - .gitlab/ci/jobs/build/bin_packages_rpm_dependencies.sh script: - wget https://sh.rustup.rs/rustup-init.sh - chmod +x rustup-init.sh diff --git a/.gitlab/ci/pipelines/schedule_extended_test.yml b/.gitlab/ci/pipelines/schedule_extended_test.yml index 2ec83500e460..4820da500f48 100644 --- a/.gitlab/ci/pipelines/schedule_extended_test.yml +++ b/.gitlab/ci/pipelines/schedule_extended_test.yml @@ -322,11 +322,7 @@ oc.build:dpkg:amd64: dependencies: [] before_script: - . ./scripts/version.sh - - export DEBIAN_FRONTEND=noninteractive - - apt update - - apt-get install -y rsync git m4 build-essential patch unzip wget opam jq bc autoconf - cmake libev-dev libffi-dev libgmp-dev libhidapi-dev pkg-config zlib1g-dev libprotobuf-dev - protobuf-compiler libsqlite3-dev jq + - .gitlab/ci/jobs/build/bin_packages_deb_dependencies.sh script: - wget https://sh.rustup.rs/rustup-init.sh - chmod +x rustup-init.sh @@ -369,7 +365,7 @@ oc.build:rpm:amd64: dependencies: [] before_script: - . ./scripts/version.sh - - .gitlab/ci/jobs/build/bin_packages_rpm.sh + - .gitlab/ci/jobs/build/bin_packages_rpm_dependencies.sh script: - wget https://sh.rustup.rs/rustup-init.sh - chmod +x rustup-init.sh diff --git a/ci/bin/common.ml b/ci/bin/common.ml index 82f43342f752..2a69922fbdb2 100644 --- a/ci/bin/common.ml +++ b/ci/bin/common.ml @@ -730,16 +730,8 @@ let job_build_bin_package ?dependencies ?rules ~__POS__ ~name before_script ~source_version:true (match target with - | Dpkg -> - [ - "export DEBIAN_FRONTEND=noninteractive"; - "apt update"; - "apt-get install -y rsync git m4 build-essential patch unzip wget \ - opam jq bc autoconf cmake libev-dev libffi-dev libgmp-dev \ - libhidapi-dev pkg-config zlib1g-dev libprotobuf-dev \ - protobuf-compiler libsqlite3-dev jq"; - ] - | Rpm -> [".gitlab/ci/jobs/build/bin_packages_rpm.sh"]) + | Dpkg -> [".gitlab/ci/jobs/build/bin_packages_deb_dependencies.sh"] + | Rpm -> [".gitlab/ci/jobs/build/bin_packages_rpm_dependencies.sh"]) in job ?rules -- GitLab