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

Merge pull request #7221 from zmstone/build-exclude-gpb-in-appup-update 

build(appup): exclude gpb from appup checks
This commit is contained in:
Zaiming (Stone) Shi 2022-03-07 06:47:00 +01:00 committed by GitHub
parent 8df4fb98af 111b93b4ea
commit f8004fdd26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/update-appup.sh
View File

@ -60,9 +60,17 @@ PACKAGE_NAME="${PROFILE}-${SYSTEM}-${PREV_VERSION}-${ARCH}.zip"
DOWNLOAD_URL="https://www.emqx.com/downloads/${DIR}/v${PREV_VERSION}/${PACKAGE_NAME}" DOWNLOAD_URL="https://www.emqx.com/downloads/${DIR}/v${PREV_VERSION}/${PACKAGE_NAME}"
if [ ! -f EMQX_ENTERPRISE ]; then if [ ! -f EMQX_ENTERPRISE ]; then
SRC_REPO='emqx.git'
SRC_DIRS='{src,apps,lib-ce}/**' SRC_DIRS='{src,apps,lib-ce}/**'
else else
SRC_REPO='emqx-enterprise.git'
SRC_DIRS='{src,apps,lib-ee}/**' SRC_DIRS='{src,apps,lib-ee}/**'
fi fi
# shellcheck disable=SC2086 # shellcheck disable=SC2086
./scripts/update_appup.escript --make-command "make ${PROFILE}-rel" --binary-rel-url "$DOWNLOAD_URL" --release-dir "_build/${PROFILE}/rel/emqx/lib" --src-dirs "${SRC_DIRS}" $ESCRIPT_ARGS "$PREV_VERSION" ./scripts/update_appup.escript \
--make-command "make ${PROFILE}-rel" \
--binary-rel-url "$DOWNLOAD_URL" \
--repo "$SRC_REPO" \
--release-dir "_build/${PROFILE}/rel/emqx/lib" \
--src-dirs "${SRC_DIRS}" \
$ESCRIPT_ARGS "$PREV_VERSION"

1
scripts/update_appup.escript
View File

@ -531,6 +531,7 @@ index_app(AppFile) ->
, modules = Modules , modules = Modules
}}. }}.
diff_app(_, gpb, _, _) -> ok; %% gpb is not a runtime app
diff_app(UpOrDown, App, diff_app(UpOrDown, App,
#app{version = NewVersion, modules = NewModules}, #app{version = NewVersion, modules = NewModules},
#app{version = OldVersion, modules = OldModules}) -> #app{version = OldVersion, modules = OldModules}) ->