From 5303b3cf98a2e5ae9b5efc3a7a2c4592c90efeaa Mon Sep 17 00:00:00 2001 From: appel_c Date: Wed, 24 Sep 2025 12:11:19 -0500 Subject: [PATCH] fix: remove manual names for repo checkouts --- checkout_repositories/run_ci.sh | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/checkout_repositories/run_ci.sh b/checkout_repositories/run_ci.sh index 3e5a0cf..693ac50 100644 --- a/checkout_repositories/run_ci.sh +++ b/checkout_repositories/run_ci.sh @@ -2,6 +2,7 @@ set -euo pipefail echo " Received input parameters: $* " +PLUGIN_REPO_NAME="$1" PLUGIN_URL="https://gitea.psi.ch/bec/$1.git" PLUGIN_BRANCH="$2" CORE_BRANCH="$3" @@ -14,11 +15,11 @@ echo "--- Repository checkouts begin ---" echo "=== Checkout BEC Plugin ===" mkdir -p ./_plugin_checkout_/ cd ./_plugin_checkout_/ -if git clone --depth 1 --branch "$PLUGIN_BRANCH" "$PLUGIN_URL" plugin_repo; then +if git clone --depth 1 --branch "$PLUGIN_BRANCH" "$PLUGIN_URL"; then echo "Plugin checkout successful" else echo "Plugin checkout failed, trying default branch" - git clone --depth 1 "$PLUGIN_URL" plugin_repo + git clone --depth 1 "$PLUGIN_URL" fi echo " --- Installed Plugin content to $(pwd) --- " @@ -29,11 +30,11 @@ cd .. echo "=== Checkout BEC Core ===" mkdir -p ./_bec_checkout_/ cd ./_bec_checkout_/ -if git clone --depth 1 --branch "$CORE_BRANCH" https://github.com/bec-project/bec.git bec_core; then +if git clone --depth 1 --branch "$CORE_BRANCH" https://github.com/bec-project/bec.git; then echo "Core checkout successful" else echo "Core checkout failed, trying default branch" - git clone --depth 1 https://github.com/bec-project/bec.git bec_core + git clone --depth 1 https://github.com/bec-project/bec.git fi echo " --- Installed Core content to $(pwd) --- " @@ -43,11 +44,11 @@ cd .. echo "=== Checkout BEC Widgets ===" mkdir -p ./_bec_widgets_checkout_/ cd ./_bec_widgets_checkout_/ -if git clone --depth 1 --branch "$WIDGETS_BRANCH" https://github.com/bec-project/bec_widgets.git bec_widgets; then +if git clone --depth 1 --branch "$WIDGETS_BRANCH" https://github.com/bec-project/bec_widgets.git; then echo "Widgets checkout successful" else echo "Widgets checkout failed, trying default branch" - git clone --depth 1 https://github.com/bec-project/bec_widgets.git bec_widgets + git clone --depth 1 https://github.com/bec-project/bec_widgets.git fi echo " --- Installed Widgets content to $(pwd) --- " @@ -57,11 +58,11 @@ cd .. echo "=== Checkout Ophyd Devices ===" mkdir -p ./_ophyd_devices_checkout_/ cd ./_ophyd_devices_checkout_/ -if git clone --depth 1 --branch "$OPHYD_DEVICES_BRANCH" https://github.com/bec-project/ophyd_devices.git bec_ophyd_devices; then +if git clone --depth 1 --branch "$OPHYD_DEVICES_BRANCH" https://github.com/bec-project/ophyd_devices.git; then echo "Ophyd Devices checkout successful" else echo "Ophyd Devices checkout failed, trying default branch" - git clone --depth 1 https://github.com/bec-project/ophyd_devices.git bec_ophyd_devices + git clone --depth 1 https://github.com/bec-project/ophyd_devices.git fi echo " --- Installed Ophyd Devices content to $(pwd) --- "