From 52883fda9308bb19757a765dde33740cf9c2ea9c Mon Sep 17 00:00:00 2001 From: Pietro Abate Date: Thu, 27 Jun 2024 17:51:10 +0200 Subject: [PATCH 1/3] packaging next: make sure to copy only octez binaries in stage area --- scripts/packaging/build-deb-local.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/packaging/build-deb-local.sh b/scripts/packaging/build-deb-local.sh index 560cf05566f6..60174954b852 100755 --- a/scripts/packaging/build-deb-local.sh +++ b/scripts/packaging/build-deb-local.sh @@ -12,7 +12,11 @@ make all mkdir -p scripts/packaging/octez/binaries mkdir -p scripts/packaging/octez/zcash-params rm -Rf scripts/packaging/octez/binaries/* -cp octez-* scripts/packaging/octez/binaries/ + +EXECUTABLES=$(cat script-inputs/*-executables) +for ex in $EXECUTABLES; do + cp "$ex" scripts/packaging/octez/binaries/ +done # Copy the zcash parametes to be packaged cp -a _opam/share/zcash-params scripts/packaging/octez/ -- GitLab From 944e7adb25aab48bcc6bcda1fbcde0f305b3425b Mon Sep 17 00:00:00 2001 From: Pietro Abate Date: Thu, 27 Jun 2024 17:52:00 +0200 Subject: [PATCH 2/3] packaging next: add DEBMAIL env var --- scripts/ci/build-debian-packages.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/ci/build-debian-packages.sh b/scripts/ci/build-debian-packages.sh index c6f8c99182cc..68f40a36bd3a 100755 --- a/scripts/ci/build-debian-packages.sh +++ b/scripts/ci/build-debian-packages.sh @@ -13,6 +13,8 @@ export BLST_PORTABLE=true cp -a ./* /root/tezos/ cd /root/tezos/ +export DEBEMAIL="contact@nomadic-labs.com" + if [ -n "${gitlab_release_no_v:-}" ]; then DEBVERSION=$gitlab_release_no_v DEBCHANGELOG="New Release $gitlab_release_no_v / $CI_COMMIT_SHORT_SHA" -- GitLab From 9ce43bf5e7b53106840588cb01606ddb0b776143 Mon Sep 17 00:00:00 2001 From: Pietro Abate Date: Thu, 27 Jun 2024 16:46:11 +0200 Subject: [PATCH 3/3] packages next: fix test packages release ( internal use only ) --- scripts/ci/build-debian-packages.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci/build-debian-packages.sh b/scripts/ci/build-debian-packages.sh index 68f40a36bd3a..95fd2abc82f1 100755 --- a/scripts/ci/build-debian-packages.sh +++ b/scripts/ci/build-debian-packages.sh @@ -19,7 +19,7 @@ if [ -n "${gitlab_release_no_v:-}" ]; then DEBVERSION=$gitlab_release_no_v DEBCHANGELOG="New Release $gitlab_release_no_v / $CI_COMMIT_SHORT_SHA" else - DEBVERSION=$(date +'%Y%m%d%h%m')+$CI_COMMIT_SHORT_SHA + DEBVERSION=$(date +'%Y%m%d%H%M')+$CI_COMMIT_SHORT_SHA DEBCHANGELOG="Test package commit $CI_COMMIT_REF_NAME" fi -- GitLab