From c10e3787832f25c07a0a77c41034d074eaa23a31 Mon Sep 17 00:00:00 2001 From: Killian Delarue Date: Mon, 22 Apr 2024 14:15:53 +0200 Subject: [PATCH 1/2] Scripts: Prevent octez-release failure when finding packages --- scripts/ci/octez-release.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/ci/octez-release.sh b/scripts/ci/octez-release.sh index e9074b8f74e4..83d0177462ad 100755 --- a/scripts/ci/octez-release.sh +++ b/scripts/ci/octez-release.sh @@ -13,11 +13,11 @@ script_inputs_dir="$src_dir/script-inputs" binaries="$(cat "$script_inputs_dir/released-executables")" # these variables are used in the script scripts/ci/create_gitlab_package.sh -debian_bookworm_packages="$(find packages/debian/bookworm/ -maxdepth 1 -name octez-\*.deb)" -ubuntu_focal_packages="$(find packages/ubuntu/focal/ -maxdepth 1 -name octez-\*.deb)" -ubuntu_jammy_packages="$(find packages/ubuntu/jammy/ -maxdepth 1 -name octez-\*.deb)" -fedora_packages="$(find packages/fedora/39/ -maxdepth 1 -name octez-\*.rpm)" -rockylinux_packages="$(find packages/rockylinux/9.3/ -maxdepth 1 -name octez-\*.rpm)" +debian_bookworm_packages="$(find packages/debian/bookworm/ -maxdepth 1 -name octez-\*.deb 2> /dev/null || printf '')" +ubuntu_focal_packages="$(find packages/ubuntu/focal/ -maxdepth 1 -name octez-\*.deb 2> /dev/null || printf '')" +ubuntu_jammy_packages="$(find packages/ubuntu/jammy/ -maxdepth 1 -name octez-\*.deb 2> /dev/null || printf '')" +fedora_packages="$(find packages/fedora/39/ -maxdepth 1 -name octez-\*.rpm 2> /dev/null || printf '')" +rockylinux_packages="$(find packages/rockylinux/9.3/ -maxdepth 1 -name octez-\*.rpm 2> /dev/null || printf '')" octez_source_content="$script_inputs_dir/octez-source-content" -- GitLab From 5fb7cd3a993cc5db5a324ec519ea574812903f48 Mon Sep 17 00:00:00 2001 From: Killian Delarue Date: Fri, 26 Apr 2024 15:57:00 +0200 Subject: [PATCH 2/2] Scripts: Move packages find to create_gitlab_packages --- scripts/ci/create_gitlab_package.sh | 6 ++++++ scripts/ci/octez-release.sh | 7 ------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/scripts/ci/create_gitlab_package.sh b/scripts/ci/create_gitlab_package.sh index 5f5a1bfd026e..58f1811266e7 100755 --- a/scripts/ci/create_gitlab_package.sh +++ b/scripts/ci/create_gitlab_package.sh @@ -11,6 +11,12 @@ set -eu # shellcheck source=./scripts/ci/octez-release.sh . ./scripts/ci/octez-release.sh +debian_bookworm_packages="$(find packages/debian/bookworm/ -maxdepth 1 -name octez-\*.deb 2> /dev/null || printf '')" +ubuntu_focal_packages="$(find packages/ubuntu/focal/ -maxdepth 1 -name octez-\*.deb 2> /dev/null || printf '')" +ubuntu_jammy_packages="$(find packages/ubuntu/jammy/ -maxdepth 1 -name octez-\*.deb 2> /dev/null || printf '')" +fedora_packages="$(find packages/fedora/39/ -maxdepth 1 -name octez-\*.rpm 2> /dev/null || printf '')" +rockylinux_packages="$(find packages/rockylinux/9.3/ -maxdepth 1 -name octez-\*.rpm 2> /dev/null || printf '')" + # https://docs.gitlab.com/ee/user/packages/generic_packages/index.html#download-package-file # :gitlab_api_url/projects/:id/packages/generic/:package_name/:package_version/:file_name gitlab_octez_package_url="${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/${gitlab_octez_binaries_package_name}/${gitlab_package_version}" diff --git a/scripts/ci/octez-release.sh b/scripts/ci/octez-release.sh index 83d0177462ad..75b3bd406cee 100755 --- a/scripts/ci/octez-release.sh +++ b/scripts/ci/octez-release.sh @@ -12,13 +12,6 @@ script_inputs_dir="$src_dir/script-inputs" binaries="$(cat "$script_inputs_dir/released-executables")" -# these variables are used in the script scripts/ci/create_gitlab_package.sh -debian_bookworm_packages="$(find packages/debian/bookworm/ -maxdepth 1 -name octez-\*.deb 2> /dev/null || printf '')" -ubuntu_focal_packages="$(find packages/ubuntu/focal/ -maxdepth 1 -name octez-\*.deb 2> /dev/null || printf '')" -ubuntu_jammy_packages="$(find packages/ubuntu/jammy/ -maxdepth 1 -name octez-\*.deb 2> /dev/null || printf '')" -fedora_packages="$(find packages/fedora/39/ -maxdepth 1 -name octez-\*.rpm 2> /dev/null || printf '')" -rockylinux_packages="$(find packages/rockylinux/9.3/ -maxdepth 1 -name octez-\*.rpm 2> /dev/null || printf '')" - octez_source_content="$script_inputs_dir/octez-source-content" ### Compute GitLab release names from git tags -- GitLab