build: rename emqx-ee to emqx-enterprise
This commit is contained in:
Zaiming Shi
Zaiming (Stone) Shi
parent
581cb6ac5d
commit
e2d7ff2b0f
|
|
@ -127,7 +127,7 @@ jobs:
|
|||
matrix:
|
||||
profile: # no EDGE for mac
|
||||
- emqx
|
||||
- emqx-ee
|
||||
- emqx-enterprise
|
||||
otp:
|
||||
- 24.1.5-2
|
||||
macos:
|
||||
|
|
@ -213,7 +213,7 @@ jobs:
|
|||
profile: ## all editions for linux
|
||||
- emqx-edge
|
||||
- emqx
|
||||
- emqx-ee
|
||||
- emqx-enterprise
|
||||
otp:
|
||||
- 24.1.5-2 # we test with OTP 23, but only build package on OTP 24 versions
|
||||
arch:
|
||||
|
|
@ -240,9 +240,9 @@ jobs:
|
|||
- os: raspbian10
|
||||
profile: emqx
|
||||
- os: raspbian9
|
||||
profile: emqx-ee
|
||||
profile: emqx-enterprise
|
||||
- os: raspbian10
|
||||
profile: emqx-ee
|
||||
profile: emqx-enterprise
|
||||
|
||||
defaults:
|
||||
run:
|
||||
|
|
@ -333,7 +333,7 @@ jobs:
|
|||
profile: # all editions for docker
|
||||
- emqx-edge
|
||||
- emqx
|
||||
- emqx-ee
|
||||
- emqx-enterprise
|
||||
# NOTE: for docker, only support latest otp version, not a matrix
|
||||
otp:
|
||||
- 24.1.5-2 # update to latest
|
||||
|
|
@ -403,7 +403,7 @@ jobs:
|
|||
profile:
|
||||
- emqx-edge
|
||||
- emqx
|
||||
- emqx-ee
|
||||
- emqx-enterprise
|
||||
otp:
|
||||
- 24.1.5-2
|
||||
|
||||
|
|
@ -463,7 +463,7 @@ jobs:
|
|||
- name: update repo.emqx.io
|
||||
if: github.event_name == 'release'
|
||||
run: |
|
||||
if [ "${{ matrix. profile }}" = 'emqx-ee' ]; then
|
||||
if [ "${{ matrix.profile }}" = 'emqx-enterprise' ]; then
|
||||
BOOL_FLAG_NAME="emqx_ee"
|
||||
else
|
||||
BOOL_FLAG_NAME="emqx_ce"
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ jobs:
|
|||
profile:
|
||||
- emqx-edge
|
||||
- emqx
|
||||
- emqx-ee
|
||||
- emqx-enterprise
|
||||
otp:
|
||||
- 24.1.5-2
|
||||
os:
|
||||
|
|
@ -53,7 +53,7 @@ jobs:
|
|||
matrix:
|
||||
profile:
|
||||
- emqx
|
||||
- emqx-ee
|
||||
- emqx-enterprise
|
||||
otp:
|
||||
- 24.1.5-2
|
||||
macos:
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ jobs:
|
|||
run: |
|
||||
echo "https://ci%40emqx.io:${{ secrets.CI_GIT_TOKEN }}@github.com" > $HOME/.git-credentials
|
||||
git config --global credential.helper store
|
||||
make emqx-ee-zip
|
||||
make emqx-enterprise-zip
|
||||
- uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: emqx-broker
|
||||
|
|
|
|||
|
|
@ -38,9 +38,9 @@ jobs:
|
|||
fail-fast: false
|
||||
matrix:
|
||||
profile:
|
||||
- emqx-edge
|
||||
- emqx
|
||||
- emqx-ee
|
||||
- emqx-edge
|
||||
- emqx-enterprise
|
||||
cluster_db_backend:
|
||||
- mnesia
|
||||
- rlog
|
||||
|
|
@ -88,7 +88,7 @@ jobs:
|
|||
matrix:
|
||||
profile:
|
||||
- emqx
|
||||
# - emqx-ee # TODO test enterprise
|
||||
# - emqx-enterprise # TODO test enterprise
|
||||
|
||||
steps:
|
||||
- uses: actions/download-artifact@v2
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ jobs:
|
|||
matrix:
|
||||
profile:
|
||||
- emqx
|
||||
- emqx-ee
|
||||
- emqx-enterprise
|
||||
otp_vsn:
|
||||
- 24.1.5-2
|
||||
|
||||
|
|
@ -68,7 +68,7 @@ jobs:
|
|||
if [ $PROFILE = "emqx" ];then
|
||||
broker="emqx-ce"
|
||||
else
|
||||
broker="emqx-ee"
|
||||
broker="emqx-enterprise"
|
||||
fi
|
||||
echo "BROKER=$broker" >> $GITHUB_ENV
|
||||
|
||||
|
|
|
|||
|
|
@ -23,12 +23,6 @@ jobs:
|
|||
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- name: set git credentials
|
||||
run: |
|
||||
if make emqx-ee --dry-run > /dev/null 2>&1; then
|
||||
echo "https://ci%40emqx.io:${{ secrets.CI_GIT_TOKEN }}@github.com" > $HOME/.git-credentials
|
||||
git config --global credential.helper store
|
||||
fi
|
||||
- name: xref
|
||||
run: make xref
|
||||
- name: dialyzer
|
||||
|
|
@ -45,12 +39,6 @@ jobs:
|
|||
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- name: set git credentials
|
||||
run: |
|
||||
if make emqx-ee --dry-run > /dev/null 2>&1; then
|
||||
echo "https://ci%40emqx.io:${{ secrets.CI_GIT_TOKEN }}@github.com" > $HOME/.git-credentials
|
||||
git config --global credential.helper store
|
||||
fi
|
||||
- name: proper
|
||||
run: make proper
|
||||
|
||||
|
|
|
|||
6
Makefile
6
Makefile
|
|
@ -15,8 +15,8 @@ ifeq ($(OS),Windows_NT)
|
|||
endif
|
||||
|
||||
PROFILE ?= emqx
|
||||
REL_PROFILES := emqx emqx-edge emqx-ee
|
||||
PKG_PROFILES := emqx-pkg emqx-edge-pkg emqx-ee-pkg
|
||||
REL_PROFILES := emqx emqx-edge emqx-enterprise
|
||||
PKG_PROFILES := emqx-pkg emqx-edge-pkg emqx-enterprise-pkg
|
||||
PROFILES := $(REL_PROFILES) $(PKG_PROFILES) default
|
||||
|
||||
CT_NODE_NAME ?= 'test@127.0.0.1'
|
||||
|
|
@ -182,7 +182,7 @@ ALL_ZIPS = $(REL_PROFILES)
|
|||
$(foreach zt,$(ALL_ZIPS),$(eval $(call gen-docker-target,$(zt))))
|
||||
|
||||
## emqx-docker-testing
|
||||
## emqx-ee-docker-testing
|
||||
## emqx-enterprise-docker-testing
|
||||
## is to directly copy a unzipped zip-package to a
|
||||
## base image such as ubuntu20.04. Mostly for testing
|
||||
.PHONY: $(REL_PROFILES:%=%-docker-testing)
|
||||
|
|
|
|||
8
build
8
build
|
|
@ -52,13 +52,10 @@ log() {
|
|||
}
|
||||
|
||||
docgen() {
|
||||
local conf_doc_html libs_dir1 libs_dir2
|
||||
conf_doc_html="$(pwd)/_build/${PROFILE}/rel/emqx/etc/emqx-config-doc.html"
|
||||
echo "===< Generating config document $conf_doc_html"
|
||||
local libs_dir1 libs_dir2
|
||||
libs_dir1="$(find "_build/default/lib/" -maxdepth 2 -name ebin -type d)"
|
||||
libs_dir2="$(find "_build/$PROFILE/lib/" -maxdepth 2 -name ebin -type d)"
|
||||
# shellcheck disable=SC2086
|
||||
erl -noshell -pa $libs_dir1 $libs_dir2 -eval "file:write_file('$conf_doc_html', hocon_schema_html:gen(emqx_conf_schema, \"EMQ X ${PKG_VSN}\")), halt(0)."
|
||||
|
||||
local conf_doc_markdown
|
||||
conf_doc_markdown="$(pwd)/_build/${PROFILE}/rel/emqx/etc/emqx-config-doc.md"
|
||||
echo "===< Generating config document $conf_doc_markdown"
|
||||
|
|
@ -146,6 +143,7 @@ make_zip() {
|
|||
## for DEB and RPM packages the dependencies are resoved by yum and apt
|
||||
cp_dyn_libs "${tard}/emqx"
|
||||
(cd "${tard}" && zip -qr - emqx) > "${zipball}"
|
||||
log "Zip package successfully created: ${zipball}"
|
||||
}
|
||||
|
||||
## This function builds the default docker image based on alpine:3.14 (by default)
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@ RUN cd /emqx \
|
|||
|
||||
FROM $RUN_FROM
|
||||
|
||||
## define ARG again after 'FROM $RUN_FROM'
|
||||
ARG EMQX_NAME=emqx
|
||||
|
||||
COPY deploy/docker/docker-entrypoint.sh /usr/bin/
|
||||
|
|
|
|||
|
|
@ -148,40 +148,48 @@ prod_overrides() ->
|
|||
|
||||
profiles() ->
|
||||
Vsn = get_vsn(),
|
||||
[ {'emqx', [ {erl_opts, prod_compile_opts()}
|
||||
[ {'emqx',
|
||||
[ {erl_opts, prod_compile_opts()}
|
||||
, {relx, relx(Vsn, cloud, bin, ce)}
|
||||
, {overrides, prod_overrides()}
|
||||
, {project_app_dirs, project_app_dirs(ce)}
|
||||
]}
|
||||
, {'emqx-pkg', [ {erl_opts, prod_compile_opts()}
|
||||
, {'emqx-pkg',
|
||||
[ {erl_opts, prod_compile_opts()}
|
||||
, {relx, relx(Vsn, cloud, pkg, ce)}
|
||||
, {overrides, prod_overrides()}
|
||||
, {project_app_dirs, project_app_dirs(ce)}
|
||||
]}
|
||||
, {'emqx-ee', [ {erl_opts, prod_compile_opts()}
|
||||
, {'emqx-enterprise',
|
||||
[ {erl_opts, prod_compile_opts()}
|
||||
, {relx, relx(Vsn, cloud, bin, ee)}
|
||||
, {overrides, prod_overrides()}
|
||||
, {project_app_dirs, project_app_dirs(ee)}
|
||||
]}
|
||||
, {'emqx-ee-pkg', [ {erl_opts, prod_compile_opts()}
|
||||
, {'emqx-enterprise-pkg',
|
||||
[ {erl_opts, prod_compile_opts()}
|
||||
, {relx, relx(Vsn, cloud, pkg, ee)}
|
||||
, {overrides, prod_overrides()}
|
||||
, {project_app_dirs, project_app_dirs(ee)}
|
||||
]}
|
||||
, {'emqx-edge', [ {erl_opts, prod_compile_opts()}
|
||||
, {'emqx-edge',
|
||||
[ {erl_opts, prod_compile_opts()}
|
||||
, {relx, relx(Vsn, edge, bin, ce)}
|
||||
, {overrides, prod_overrides()}
|
||||
, {project_app_dirs, project_app_dirs(ce)}
|
||||
]}
|
||||
, {'emqx-edge-pkg', [ {erl_opts, prod_compile_opts()}
|
||||
, {'emqx-edge-pkg',
|
||||
[ {erl_opts, prod_compile_opts()}
|
||||
, {relx, relx(Vsn, edge, pkg, ce)}
|
||||
, {overrides, prod_overrides()}
|
||||
, {project_app_dirs, project_app_dirs(ce)}
|
||||
]}
|
||||
, {check, [ {erl_opts, common_compile_opts()}
|
||||
, {check,
|
||||
[ {erl_opts, common_compile_opts()}
|
||||
, {project_app_dirs, project_app_dirs(ce)}
|
||||
]}
|
||||
, {test, [ {deps, test_deps()}
|
||||
, {test,
|
||||
[ {deps, test_deps()}
|
||||
, {erl_opts, common_compile_opts() ++ erl_opts_i(ce) }
|
||||
, {extra_src_dirs, [{"test", [{recursive, true}]}]}
|
||||
, {project_app_dirs, project_app_dirs(ce)}
|
||||
|
|
|
|||
Loading…
Reference in New Issue