yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: move scripts/relup-base-vsns.sh to sub-dir

This commit is contained in:
Zaiming (Stone) Shi 2022-07-01 06:43:22 +02:00
parent 73f49ca6e5
commit 114d784d1a
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/run_relup_tests.yaml vendored
View File

@ -37,8 +37,8 @@ jobs:
cd emqx cd emqx
ce_vsn="$(./pkg-vsn.sh opensource)" ce_vsn="$(./pkg-vsn.sh opensource)"
ee_vsn="$(./pkg-vsn.sh enterprise)" ee_vsn="$(./pkg-vsn.sh enterprise)"
old_ce_vsns="$(./scripts/relup-base-vsns.sh opensource | xargs)" old_ce_vsns="$(./scripts/relup-build/base-vsns.sh opensource | xargs)"
old_ee_vsns="$(./scripts/relup-base-vsns.sh enterprise | 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(" ")') 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_CE_VSN::$ce_vsn"
echo "::set-output name=CUR_EE_VSN::$ee_vsn" echo "::set-output name=CUR_EE_VSN::$ee_vsn"

2
scripts/relup-base-packages.sh
View File

@ -37,7 +37,7 @@ case "$UNAME" in
;; ;;
esac 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() { fullvsn() {
env PKG_VSN="$1" "${ROOT_DIR}"/pkg-vsn.sh "$PROFILE" --long env PKG_VSN="$1" "${ROOT_DIR}"/pkg-vsn.sh "$PROFILE" --long

2
scripts/relup-base-vsns.sh → scripts/relup-build/base-vsns.sh
View File

@ -2,7 +2,7 @@
set -euo pipefail set -euo pipefail
# ensure dir # ensure dir
cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")/.." cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")/../.."
## This script prints the relup upgrade base versions ## This script prints the relup upgrade base versions
## for the given EMQX edition (specified as first arg) ## for the given EMQX edition (specified as first arg)