From 805c032a411a28e23069f6ec521c82a7c2cae198 Mon Sep 17 00:00:00 2001 From: Killian Delarue Date: Wed, 8 Nov 2023 16:25:16 +0100 Subject: [PATCH 1/2] CI: Create bin_package_common --- .gitlab/ci/jobs/build/bin_packages_common.yml | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 .gitlab/ci/jobs/build/bin_packages_common.yml diff --git a/.gitlab/ci/jobs/build/bin_packages_common.yml b/.gitlab/ci/jobs/build/bin_packages_common.yml new file mode 100644 index 000000000000..c82c65afdd30 --- /dev/null +++ b/.gitlab/ci/jobs/build/bin_packages_common.yml @@ -0,0 +1,23 @@ +.bin_packages_common: + variables: + TARGET: "" + OCTEZ_PKGMAINTAINER: "nomadic-labs" + BLST_PORTABLE: "yes" + ARCH: "amd64" + script: + - . ./scripts/version.sh + - wget https://sh.rustup.rs/rustup-init.sh + - chmod +x rustup-init.sh + - ./rustup-init.sh --profile minimal --default-toolchain $recommended_rust_version -y + - . $HOME/.cargo/env + - export OPAMYES="true" + - opam init --bare --disable-sandboxing + - make build-deps + - eval $(opam env) + - make $TARGET + artifacts: + name: "${TARGET}-$ARCH-$CI_COMMIT_REF_SLUG" + expire_in: 1 day + when: on_success + tags: + - amd64 -- GitLab From 9af552cce3b50faee78255a4abc1a470c612a904 Mon Sep 17 00:00:00 2001 From: Killian Delarue Date: Wed, 8 Nov 2023 16:28:16 +0100 Subject: [PATCH 2/2] CI: Use bin_packages_common in bin_packages and bin_packages_manual --- .gitlab/ci/jobs/build/bin_packages.yml | 52 ++++++------------- .gitlab/ci/jobs/build/bin_packages_manual.yml | 45 +++++----------- 2 files changed, 27 insertions(+), 70 deletions(-) diff --git a/.gitlab/ci/jobs/build/bin_packages.yml b/.gitlab/ci/jobs/build/bin_packages.yml index 3d817d72a9d4..ef120db513d0 100644 --- a/.gitlab/ci/jobs/build/bin_packages.yml +++ b/.gitlab/ci/jobs/build/bin_packages.yml @@ -1,55 +1,33 @@ +include: .gitlab/ci/jobs/build/bin_packages_common.yml + build:dpkg:amd64: + extends: + - .tags_template__build + - .bin_packages_common image: debian:bookworm stage: build needs: [] - script: + variables: + TARGET: "dpkg" + before_script: - 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 - - wget https://sh.rustup.rs/rustup-init.sh - - chmod +x rustup-init.sh - - ./rustup-init.sh --profile minimal --default-toolchain 1.64.0 -y - - . $HOME/.cargo/env - - export OPAMYES="true" - - opam init --bare --disable-sandboxing - - make build-deps - - eval $(opam env) - - make dpkg - variables: - OCTEZ_PKGMAINTAINER: "dev@nomadic-labs.com" - BLST_PORTABLE: "yes" - tags: - - amd64 artifacts: - name: "dpkg-$ARCH-$CI_COMMIT_REF_SLUG" paths: - octez-*.deb - expire_in: 1 day - when: on_success build:rpm:amd64: - image: fedora + extends: + - .tags_template__build + - .bin_packages_common + image: fedora:39 stage: build needs: [] - script: + variables: + TARGET: "rpm" + before_script: - dnf update -y - dnf install -y libev-devel gmp-devel hidapi-devel libffi-devel zlib-devel libpq-devel m4 perl git pkg-config rpmdevtools python3-devel python3-setuptools wget opam rsync which cargo autoconf mock systemd systemd-rpm-macros cmake python3-wheel python3-tox-current-env - - wget https://sh.rustup.rs/rustup-init.sh - - chmod +x rustup-init.sh - - ./rustup-init.sh --profile minimal --default-toolchain 1.64.0 -y - - . $HOME/.cargo/env - - export OPAMYES="true" - - opam init --bare --disable-sandboxing - - make build-deps - - eval $(opam env) - - make rpm - variables: - OCTEZ_PKGMAINTAINER: "dev@nomadic-labs.com" - BLST_PORTABLE: "yes" - tags: - - amd64 artifacts: - name: "rpm-$ARCH-$CI_COMMIT_REF_SLUG" paths: - octez-*.rpm - expire_in: 1 day - when: on_success diff --git a/.gitlab/ci/jobs/build/bin_packages_manual.yml b/.gitlab/ci/jobs/build/bin_packages_manual.yml index dbbf5753a1b1..b8401cf7579a 100644 --- a/.gitlab/ci/jobs/build/bin_packages_manual.yml +++ b/.gitlab/ci/jobs/build/bin_packages_manual.yml @@ -1,57 +1,36 @@ +include: .gitlab/ci/jobs/build/bin_packages_common.yml + dpkg:amd64: extends: - .tags_template__build + - .bin_packages_common image: debian:bookworm stage: manual when: manual needs: [] - script: + variables: + TARGET: "dpkg" + before_script: - 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 - wget https://sh.rustup.rs/rustup-init.sh - - chmod +x rustup-init.sh - - ./rustup-init.sh --profile minimal --default-toolchain 1.71.1 -y - - . $HOME/.cargo/env - - export OPAMYES="true" - - opam init --bare --disable-sandboxing - - make build-deps - - eval $(opam env) - - make dpkg - variables: - OCTEZ_PKGMAINTAINER: "dev@nomadic-labs.com" - BLST_PORTABLE: "yes" artifacts: - name: "dpkg-$ARCH-$CI_COMMIT_REF_SLUG" paths: - octez-*.deb - expire_in: 1 day - when: on_success rpm:amd64: extends: - .tags_template__build - image: fedora + - .bin_packages_common + image: fedora:39 stage: manual when: manual needs: [] - script: - - dnf update -y - - dnf install -y libev-devel gmp-devel hidapi-devel libffi-devel zlib-devel libpq-devel m4 perl git pkg-config rpmdevtools python3-devel python3-setuptools wget opam rsync which cargo autoconf mock systemd systemd-rpm-macros cmake python3-wheel python3-tox-current-env - - wget https://sh.rustup.rs/rustup-init.sh - - chmod +x rustup-init.sh - - ./rustup-init.sh --profile minimal --default-toolchain 1.71.1 -y - - . $HOME/.cargo/env - - export OPAMYES="true" - - opam init --bare --disable-sandboxing - - make build-deps - - eval $(opam env) - - make rpm variables: - OCTEZ_PKGMAINTAINER: "dev@nomadic-labs.com" - BLST_PORTABLE: "yes" + TARGET: "rpm" + before_script: + - dnf update -y + - dnf install -y libev-devel gmp-devel hidapi-devel libffi-devel zlib-devel libpq-devel m4 git pkg-config rpmdevtools python3-devel python3-setuptools wget opam rsync which cargo autoconf mock systemd systemd-rpm-macros cmake python3-wheel python3-tox-current-env artifacts: - name: "rpm-$ARCH-$CI_COMMIT_REF_SLUG" paths: - octez-*.rpm - expire_in: 1 day - when: on_success -- GitLab