From 114d784d1ad949559649da4955f10c53d3f621e1 Mon Sep 17 00:00:00 2001
From: "Zaiming (Stone) Shi" <zmstone@gmail.com>
Date: Fri, 1 Jul 2022 06:43:22 +0200
Subject: [PATCH] refactor: move scripts/relup-base-vsns.sh to sub-dir

---
 .github/workflows/run_relup_tests.yaml                   | 4 ++--
 scripts/relup-base-packages.sh                           | 2 +-
 scripts/{relup-base-vsns.sh => relup-build/base-vsns.sh} | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename scripts/{relup-base-vsns.sh => relup-build/base-vsns.sh} (97%)

diff --git a/.github/workflows/run_relup_tests.yaml b/.github/workflows/run_relup_tests.yaml
index ddb8380b2..59e97d679 100644
--- a/.github/workflows/run_relup_tests.yaml
+++ b/.github/workflows/run_relup_tests.yaml
@@ -37,8 +37,8 @@ jobs:
         cd emqx
         ce_vsn="$(./pkg-vsn.sh opensource)"
         ee_vsn="$(./pkg-vsn.sh enterprise)"
-        old_ce_vsns="$(./scripts/relup-base-vsns.sh opensource | xargs)"
-        old_ee_vsns="$(./scripts/relup-base-vsns.sh enterprise | xargs)"
+        old_ce_vsns="$(./scripts/relup-build/base-vsns.sh opensource | xargs)"
+        old_ee_vsns="$(./scripts/relup-build/base-vsns.sh enterprise | xargs)"
         old_vsns=$(echo -n "${old_ce_vsns} ${old_ee_vsns}" | sed 's/ $//g' | jq -R -s -c 'split(" ")')
         echo "::set-output name=CUR_CE_VSN::$ce_vsn"
         echo "::set-output name=CUR_EE_VSN::$ee_vsn"
diff --git a/scripts/relup-base-packages.sh b/scripts/relup-base-packages.sh
index db6a74485..dddbc41b4 100755
--- a/scripts/relup-base-packages.sh
+++ b/scripts/relup-base-packages.sh
@@ -37,7 +37,7 @@ case "$UNAME" in
         ;;
 esac
 
-BASE_VERSIONS="$("${ROOT_DIR}"/scripts/relup-base-vsns.sh "$EDITION" | xargs echo -n)"
+BASE_VERSIONS="$("${ROOT_DIR}"/scripts/relup-build/base-vsns.sh "$EDITION" | xargs echo -n)"
 
 fullvsn() {
     env PKG_VSN="$1" "${ROOT_DIR}"/pkg-vsn.sh "$PROFILE" --long
diff --git a/scripts/relup-base-vsns.sh b/scripts/relup-build/base-vsns.sh
similarity index 97%
rename from scripts/relup-base-vsns.sh
rename to scripts/relup-build/base-vsns.sh
index e1ea79922..54a441e07 100755
--- a/scripts/relup-base-vsns.sh
+++ b/scripts/relup-build/base-vsns.sh
@@ -2,7 +2,7 @@
 set -euo pipefail
 
 # ensure dir
-cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")/.."
+cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")/../.."
 
 ## This script prints the relup upgrade base versions
 ## for the given EMQX edition (specified as first arg)