From e2d7ff2b0fcdf3f85c8125daa069c8e8d88cd88f Mon Sep 17 00:00:00 2001 From: Zaiming Shi Date: Wed, 24 Nov 2021 20:54:46 +0100 Subject: [PATCH] build: rename emqx-ee to emqx-enterprise --- .github/workflows/build_packages.yaml | 14 ++-- .github/workflows/build_slim_packages.yaml | 4 +- .github/workflows/run_api_tests.yaml | 2 +- .github/workflows/run_fvt_tests.yaml | 6 +- .github/workflows/run_relup_tests.yaml | 4 +- .github/workflows/run_test_cases.yaml | 12 ---- Makefile | 6 +- build | 8 +-- deploy/docker/Dockerfile | 1 + rebar.config.erl | 84 ++++++++++++---------- 10 files changed, 68 insertions(+), 73 deletions(-) diff --git a/.github/workflows/build_packages.yaml b/.github/workflows/build_packages.yaml index f8f4eb9dc..bf972f920 100644 --- a/.github/workflows/build_packages.yaml +++ b/.github/workflows/build_packages.yaml @@ -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" diff --git a/.github/workflows/build_slim_packages.yaml b/.github/workflows/build_slim_packages.yaml index 46eb7aef7..da62e296b 100644 --- a/.github/workflows/build_slim_packages.yaml +++ b/.github/workflows/build_slim_packages.yaml @@ -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: diff --git a/.github/workflows/run_api_tests.yaml b/.github/workflows/run_api_tests.yaml index fbc6ae6f8..45b387c0d 100644 --- a/.github/workflows/run_api_tests.yaml +++ b/.github/workflows/run_api_tests.yaml @@ -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 diff --git a/.github/workflows/run_fvt_tests.yaml b/.github/workflows/run_fvt_tests.yaml index f64e4e21f..45f8d8965 100644 --- a/.github/workflows/run_fvt_tests.yaml +++ b/.github/workflows/run_fvt_tests.yaml @@ -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 diff --git a/.github/workflows/run_relup_tests.yaml b/.github/workflows/run_relup_tests.yaml index 6a73f846b..18d995d44 100644 --- a/.github/workflows/run_relup_tests.yaml +++ b/.github/workflows/run_relup_tests.yaml @@ -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 diff --git a/.github/workflows/run_test_cases.yaml b/.github/workflows/run_test_cases.yaml index 8d2da0e21..d1f8bf577 100644 --- a/.github/workflows/run_test_cases.yaml +++ b/.github/workflows/run_test_cases.yaml @@ -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 diff --git a/Makefile b/Makefile index bb7024e88..e381db3ed 100644 --- a/Makefile +++ b/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) diff --git a/build b/build index 6814efe02..6ba943fab 100755 --- a/build +++ b/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) diff --git a/deploy/docker/Dockerfile b/deploy/docker/Dockerfile index 1dd7d318a..5538c5a0d 100644 --- a/deploy/docker/Dockerfile +++ b/deploy/docker/Dockerfile @@ -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/ diff --git a/rebar.config.erl b/rebar.config.erl index 78e4f3e41..22949f233 100644 --- a/rebar.config.erl +++ b/rebar.config.erl @@ -148,44 +148,52 @@ prod_overrides() -> profiles() -> Vsn = get_vsn(), - [ {'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()} - , {relx, relx(Vsn, cloud, pkg, ce)} - , {overrides, prod_overrides()} - , {project_app_dirs, project_app_dirs(ce)} - ]} - , {'emqx-ee', [ {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()} - , {relx, relx(Vsn, cloud, pkg, ee)} - , {overrides, prod_overrides()} - , {project_app_dirs, project_app_dirs(ee)} - ]} - , {'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()} - , {relx, relx(Vsn, edge, pkg, ce)} - , {overrides, prod_overrides()} - , {project_app_dirs, project_app_dirs(ce)} - ]} - , {check, [ {erl_opts, common_compile_opts()} - , {project_app_dirs, project_app_dirs(ce)} - ]} - , {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)} - ]} + [ {'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()} + , {relx, relx(Vsn, cloud, pkg, ce)} + , {overrides, prod_overrides()} + , {project_app_dirs, project_app_dirs(ce)} + ]} + , {'emqx-enterprise', + [ {erl_opts, prod_compile_opts()} + , {relx, relx(Vsn, cloud, bin, ee)} + , {overrides, prod_overrides()} + , {project_app_dirs, project_app_dirs(ee)} + ]} + , {'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()} + , {relx, relx(Vsn, edge, bin, ce)} + , {overrides, prod_overrides()} + , {project_app_dirs, project_app_dirs(ce)} + ]} + , {'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()} + , {project_app_dirs, project_app_dirs(ce)} + ]} + , {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)} + ]} ]. %% RelType: cloud (full size) | edge (slim size)