Merge pull request #9298 from zmstone/1103-ci-fix-build

1103 ci fix build
This commit is contained in:
Zaiming (Stone) Shi 2022-11-03 20:32:21 +01:00 committed by GitHub
commit 25f200a122
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 4 deletions

View File

@ -15,7 +15,15 @@ runs:
shell: bash
run: |
git config --global --add safe.directory "$GITHUB_WORKSPACE"
if make emqx-ee --dry-run > /dev/null 2>&1; then
if [ -d source ]; then
## source code downloaded
cd source
fi
if [ ! -d .git ]; then
echo "Not git dir, $(pwd)"
exit 1
fi
if [ -f 'EMQX_ENTERPRISE' ]; then
echo "::set-output name=profiles::[\"emqx-ee\"]"
echo "https://ci%40emqx.io:${{ inputs.ci_git_token }}@github.com" > $HOME/.git-credentials
git config --global credential.helper store

10
build
View File

@ -67,7 +67,14 @@ make_rel() {
}
relup_db() {
./scripts/relup-base-vsns.escript "$@" ./data/relup-paths.eterm
case "$PROFILE" in
*-ee*)
./scripts/relup-base-vsns.escript "$@" ./data/relup-paths-ee.eterm
;;
*)
./scripts/relup-base-vsns.escript "$@" ./data/relup-paths.eterm
;;
esac
}
## unzip previous version .zip files to _build/$PROFILE/rel/emqx/releases before making relup
@ -84,7 +91,6 @@ make_relup() {
if [[ "$OTP_BASE" != "$OTP_VSN" ]]; then
OTP_CHANGED='yes'
fi
OTP_BASE=$(relup_db otp-vsn-for "$PKG_VSN")
zip_file="_upgrade_base/${PROFILE}-$(env OTP_VSN="$OTP_BASE" PKG_VSN="$BASE_VSN" ./scripts/pkg-full-vsn.sh 'vsn_exact').zip"
if [ ! -d "$releases_dir/$BASE_VSN" ]; then
local tmp_dir

View File

@ -63,7 +63,7 @@ reload_components() ->
?INFO("reloading resource providers ..."),
emqx_rule_engine:load_providers(),
?INFO("loading plugins ..."),
load_plugins(),
_ = load_plugins(),
ok.
-endif.