Commit Graph

460 Commits

Author SHA1 Message Date
Zaiming Shi b4ee2f8d24 chore(build): refactor rebar.config.erl overlay function 2021-03-10 17:39:45 +01:00
Zaiming Shi 3d06bc30fb chore(build): pipe_dir is no longer parmaterised 2021-03-09 20:22:48 +01:00
Zaiming Shi 984b4364d6 chore(build): drop vars files 2021-03-09 20:22:48 +01:00
Zaiming Shi 95847ea10b chore(build): Support vars file for enterprise 2021-03-09 20:22:48 +01:00
Zaiming Shi d14b90ef2e chore(build): Feed relx overlay var from rebar.config.erl 2021-03-09 20:22:48 +01:00
turtleDeng 115397523d
chore(build): add more enterprise build support (#4302) 2021-03-08 20:47:31 +08:00
Zaiming Shi 08aa022029 chore(rebar.config.erl): better release matrix support 2021-03-06 21:39:08 +01:00
Zaiming Shi 00a2daba19 chore(build): add more enterprise build support 2021-03-06 10:56:07 +01:00
z8674558 80125a9606 feat(rebar.config.erl): allow community plugins 2021-03-05 23:19:34 +09:00
Zaiming Shi 4eb98fdf5e chore(compile): do not pass down EMQX_ENTERPRISE macro to deps 2021-03-05 12:55:20 +01:00
Zaiming Shi 9b3ab169ce chore(versioning): detach package version from emqx app version 2021-03-04 20:24:58 +01:00
z8674558 efd4ef8091 Merge branch 'dev/v5.0' of private:emqx/emqx into fix-merge-conflict-master-to-5.0 2021-03-04 22:12:09 +09:00
Zaiming Shi bd3bd906ca
Merge pull request #4272 from zmstone/chore-build-remove-env-var-for-ce-ee
chore(build): use only mark file to tell apart ce ee
2021-03-03 11:13:33 +01:00
Zaiming Shi cd0890796d chore(build): use only mark file to tell apart ce ee 2021-03-02 23:38:10 +01:00
Zaiming Shi c61080c862 chore(build): write rendered rebar.config only when debugging 2021-03-02 20:37:45 +01:00
zhanghongtong 1ea4a9eb7d chore(emqx_modules): enable emqx modules by default 2021-03-02 18:47:09 +08:00
Shawn cc373df49a fix(etc): remove .d suffix from dir names 2021-03-02 16:47:22 +08:00
Zaiming Shi dd06d70bce refactor(build): Move parse_transform module to root app
So we do not have to workaround the compile order issue
2021-03-02 08:40:19 +08:00
Zaiming Shi 5edef84332
Merge branch 'dev/v5.0' into fix-merge-conflict-master-to-5.0 2021-03-01 19:58:16 +01:00
Zaiming Shi 0a51bd4c2f fix(webhook): Call common lib for ssl options 2021-03-01 21:00:17 +08:00
Zaiming Shi ddadece0b2 chore(build): include emqx version as compile info 2021-02-28 21:56:47 +01:00
Zaiming Shi c54636b6c2 chore(build): inject emqx_vsn to all modules as attribute 2021-02-26 22:26:19 +01:00
Zaiming Shi 7afeadd6fc chore(ci): run eunit test in github action 2021-02-26 20:50:07 +01:00
Zaiming Shi c2cd2fd231 Merge remote-tracking branch 'origin/dev/v4.3.0' into dev/v5.0 2021-02-19 21:13:33 +01:00
Zaiming Shi aed58a14ee chore(build): rename lib-opensource to lib-ce for shorter name 2021-02-19 11:54:45 +01:00
Zaiming Shi 2fc758c49a fix(test): Pin emqx-ct-helper 1.3.6 2021-02-14 23:17:03 +01:00
Zaiming Shi d11487268e Merge remote-tracking branch 'origin/dev/v4.3.0' into resolve-conflict-v4.3.0-to-v5.0 2021-02-12 10:36:16 +01:00
Zaiming Shi 23b66c0fd5 chore(rebar.config.erl): wildcard only one level for include dir 2021-02-11 17:22:20 +01:00
Zaiming Shi e7785a63ee fix(scripts): update scripts to work with new lib-opensource dir 2021-02-11 17:22:20 +01:00
Zaiming Shi 2fa1d9d10b
Merge pull request #4168 from emqx/dev/v4.3.0
Auto-pull-request-on-2021-02-09
2021-02-09 21:28:09 +01:00
Zaiming Shi 7aff861f9b refactor(emqx_modules): Move emqx_modules to lib-opensource
emqx_moduels for enterprise is refactored as a lib/plugin
in order to avoid merge conflicts, we make sure they can
co-exist in the same branch, because lib-opensource is compiled
in opensource project and lib-enterprise (to be added) is
compiled in enterprise project
2021-02-08 21:35:44 +01:00
Zaiming Shi 7c94a02bdd
Merge pull request #4134 from jovdipp/tlsv1.3-as-default
Tlsv1.3 as default
2021-02-05 21:33:03 +01:00
Jóvan S. Dippenaar 145958a178 test(emqx-ct-helpers): version upgrade 1.3.5 2021-02-05 16:21:28 +13:00
Jóvan S. Dippenaar 6541c589ab test(tls1.3): Tests for default ssl config, as well as specific tls versions ( 1.1, 1.2, 1.3 ) 2021-02-05 16:21:28 +13:00
Zaiming Shi 55253f914c
Merge pull request #4149 from emqx/dev/v4.3.0
Auto-pull-request-on-2021-02-04
2021-02-04 23:17:10 +01:00
wwhai c30666ee26
fix(rule-engine): remove plugin_template (#4146)
chore(build): remove template plugin

The template plugin is intended to work as a standalone plugin
development template repo. Should not be in the umbrella
project.
2021-02-04 10:01:37 +01:00
JianBo He 045bc02ec9 test(ci): add proptests chekcing to the makefile 2021-02-04 14:22:17 +08:00
JianBo He 52c747ca6b chore(cover): add coverall back 2021-02-04 14:22:17 +08:00
Zaiming Shi c422b200be
Merge pull request #4088 from emqx/dev/v4.3.0
Auto-pull-request-on-2021-01-27
2021-01-27 22:02:52 +01:00
JianBo He 02cb8d0211 chore(style): set warnings_as_errors compile option 2021-01-27 18:02:12 +08:00
Zaiming Shi 6468e7af34 fix(test): Pin ct-helper 1.3.4 for tls config fix 2021-01-26 12:38:36 +01:00
Yudai Kiyofuji 455f210b4c
feat(cuttlefish): use hocon as a parsing function (#4008)
* chore(conf): add quotation for hocon

* chore(conf): fix paths incompatible with hocon

* chore(conf): use hocon as parsing function

* chore(docker): add quotation to some env variables for hocon
2021-01-19 19:52:17 +09:00
ayodele.akingbule 61d73ea530 chore(dialyzer): optimize dialyzer run 2020-12-23 11:33:02 +01:00
Shawn ea671af401 fix(build): add 'apps' to include dirs for profile test 2020-12-22 17:07:28 +08:00
zhanghongtong 3ef08f9ce3 test(meck): add meck unload after meck load 2020-12-22 13:39:49 +08:00
zhanghongtong 26758d48d1 test(auth mnesia): the initial environment is restored at the end of the test case 2020-12-22 13:39:49 +08:00
Zaiming Shi 0fe86341af chore(build): mod_vsn parse_transform is not for default profile
Since plugins are compile as default profile, the parse_transform
provided by relup_helper may not present when compiling other plugins
2020-12-16 14:29:03 +01:00
Zaiming Shi 1236c1934c chore(build): refine packages builds
This commit merge packages.mk into Makefile
with the complex part moved to shell script ./build.
2020-12-16 09:22:47 +01:00
Rory Z c0f03ca132
test(CI): add actions for build emqx packages (#3915) 2020-12-15 13:34:11 +08:00
Zaiming Shi 4fbc64d84e chore(release): Add OTP_VERSION file to release dir 2020-12-14 10:58:44 +01:00
Zaiming Shi 075c40aa05 chore(build): Fix relx config for emqx config files overlay 2020-12-12 23:02:26 +01:00
Shawn 10dbb5bc96
Fix testcases warns (#3906) 2020-12-11 18:54:48 +08:00
Zaiming Shi 93a35c4814 chore(build): add 'check' profile for xref and dialyzer 2020-12-10 12:03:16 +01:00
Zaiming Shi b2d3358368 chore(rebar): Move no_debug_info to per-profile config 2020-12-10 11:43:28 +01:00
Zaiming Shi c4d84f9eb3 chore(build): remove emqtt deps from test profile
As it's now a root level deps
2020-12-10 15:02:19 +08:00
JianBo He bc8ddb7213 chore(deps): update some deps version 2020-12-09 14:21:54 +08:00
Zaiming Shi aac3d79b7d fix(build): pre-compile parse_transform modules 2020-12-09 00:28:39 +01:00
Zaiming Shi 084ce97d41 fix(rel): rel_vsn renamed to release_version 2020-12-08 22:28:46 +01:00
Zaiming Shi 6d1cd6b7ea refactor(emqx_password): move the module to emqx application
Future plugins will require emqx as a dependency.
This commit also brings back bcrypt to the system which was temporary
removed when converting to umbrella project
2020-12-08 22:09:59 +01:00
Zaiming Shi 8fe889dd14 refactor(rebar.config): make use of rebar.config.erl 2020-12-06 23:38:14 +01:00