From 79719eca6e2ce4f7dedecbbc7ad329dd77a93cb5 Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Wed, 14 Sep 2022 12:04:03 +0200 Subject: [PATCH 1/4] build: add relup paths for 4.4.9 --- data/relup-paths.eterm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/data/relup-paths.eterm b/data/relup-paths.eterm index 02d171e8f..640e54cd3 100644 --- a/data/relup-paths.eterm +++ b/data/relup-paths.eterm @@ -29,4 +29,10 @@ [<<"4.4.0">>,<<"4.4.1">>,<<"4.4.2">>,<<"4.4.3">>,<<"4.4.4">>, <<"4.4.5">>,<<"4.4.6">>,<<"4.4.7">>], otp => <<"24.1.5-3">>}}. -{<<"4.5.0">>,#{from_versions => [<<"4.4.8">>],otp => <<"24.3.4.2-1">>}}. +{<<"4.4.9">>, + #{from_versions => + [<<"4.4.0">>,<<"4.4.1">>,<<"4.4.2">>,<<"4.4.3">>,<<"4.4.4">>, + <<"4.4.5">>,<<"4.4.6">>,<<"4.4.7">>,<<"4.4.8">>], + otp => <<"24.1.5-3">>}}. +{<<"4.5.0">>,#{from_versions => [<<"4.4.8">>,<<"4.4.9">>], + otp => <<"24.3.4.2-1">>}}. From d4fa8567c2b4044cc73093439400e56bb910ee1f Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Wed, 14 Sep 2022 12:04:22 +0200 Subject: [PATCH 2/4] ci: fix relup paths check use a different file for enterprise --- .github/workflows/apps_version_check.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/apps_version_check.yaml b/.github/workflows/apps_version_check.yaml index a86b06967..ff757d47d 100644 --- a/.github/workflows/apps_version_check.yaml +++ b/.github/workflows/apps_version_check.yaml @@ -22,9 +22,15 @@ jobs: - name: fix-git-unsafe-repository run: git config --global --add safe.directory /__w/emqx/emqx - name: Check relup version DB + if: endsWith(github.repository, 'emqx') run: | PKG_VSN=$(./pkg-vsn.sh) ./scripts/relup-base-vsns.escript check-vsn-db $PKG_VSN ./data/relup-paths.eterm + - name: Check relup version DB (ee) + if: endsWith(github.repository, 'enterprise') + run: | + PKG_VSN=$(./pkg-vsn.sh) + ./scripts/relup-base-vsns.escript check-vsn-db $PKG_VSN ./data/relup-paths-ee.eterm - name: Check relup (ce) if: endsWith(github.repository, 'emqx') run: ./scripts/update-appup.sh emqx --check From 62aa9656c4f4a9809d5caf7564acd58359ee57b5 Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Wed, 14 Sep 2022 12:36:33 +0200 Subject: [PATCH 3/4] chore: update emqx.appup.src --- src/emqx.appup.src | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/emqx.appup.src b/src/emqx.appup.src index fa43b0bb3..690acc648 100644 --- a/src/emqx.appup.src +++ b/src/emqx.appup.src @@ -2,7 +2,9 @@ %% Unless you know what you are doing, DO NOT edit manually!! {VSN, [{"4.4.8", - [{load_module,emqx_channel,brutal_purge,soft_purge,[]}, + [{load_module,emqx_relup,brutal_purge,soft_purge,[]}, + {load_module,emqx_app,brutal_purge,soft_purge,[]}, + {load_module,emqx_channel,brutal_purge,soft_purge,[]}, {load_module,emqx_shared_sub,brutal_purge,soft_purge,[]}, {load_module,emqx_cm,brutal_purge,soft_purge,[]}, {load_module,emqx_message,brutal_purge,soft_purge,[]}]}, @@ -201,7 +203,9 @@ {load_module,emqx_limiter,brutal_purge,soft_purge,[]}]}, {<<".*">>,[]}], [{"4.4.8", - [{load_module,emqx_channel,brutal_purge,soft_purge,[]}, + [{load_module,emqx_relup,brutal_purge,soft_purge,[]}, + {load_module,emqx_app,brutal_purge,soft_purge,[]}, + {load_module,emqx_channel,brutal_purge,soft_purge,[]}, {load_module,emqx_shared_sub,brutal_purge,soft_purge,[]}, {load_module,emqx_cm,brutal_purge,soft_purge,[]}, {load_module,emqx_message,brutal_purge,soft_purge,[]}]}, From 0606a55a03e609af588bc0556fac277176ea58c2 Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Wed, 14 Sep 2022 12:48:13 +0200 Subject: [PATCH 4/4] chore: print warning messages to standard_error --- scripts/relup-base-vsns.escript | 2 +- scripts/relup-base-vsns.sh | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/relup-base-vsns.escript b/scripts/relup-base-vsns.escript index 307d4f5fd..6c618ca45 100755 --- a/scripts/relup-base-vsns.escript +++ b/scripts/relup-base-vsns.escript @@ -285,4 +285,4 @@ print_warning(Msg) -> print_warning(Msg, []). print_warning(Msg, Args) -> - io:format(user, ?RED ++ Msg ++ ?RESET, Args). + io:format(standard_error, ?RED ++ Msg ++ ?RESET, Args). diff --git a/scripts/relup-base-vsns.sh b/scripts/relup-base-vsns.sh index 15b97921c..e05dff140 100755 --- a/scripts/relup-base-vsns.sh +++ b/scripts/relup-base-vsns.sh @@ -54,10 +54,12 @@ esac TAGS=( 'dummy' ) TAGS_EXCLUDE=( 'dummy' ) -while read -r vsn; do +base_versions="$(./scripts/relup-base-vsns.escript base-vsns "$CUR" ./data/relup-paths.eterm | xargs echo -n)" + +for vsn in ${base_versions}; do # shellcheck disable=SC2207 TAGS+=($(git tag -l "${GIT_TAG_PREFIX}${vsn}")) -done < <(./scripts/relup-base-vsns.escript base-vsns "$CUR" ./data/relup-paths.eterm) +done for tag_to_del in "${TAGS_EXCLUDE[@]}"; do TAGS=( "${TAGS[@]/$tag_to_del}" )