From 84f6771cbdc4c6a391605c373aba2cd2f1269374 Mon Sep 17 00:00:00 2001
From: Killian Delarue <killian.delarue@nomadic-labs.com>
Date: Fri, 26 Apr 2024 16:07:54 +0200
Subject: [PATCH] Scripts: Move packages search to [create_gitlab_package.sh]

---
 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 c5afb363b2f4..e30ce2a26437 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