Commit Graph

176 Commits

Author SHA1 Message Date
Zaiming Shi
c84af95190 chore: ensure new env override prefix variable 2021-06-15 12:35:08 +02:00
zhanghongtong
3b21ad7225 Merge branch master into main-v4.3 2021-06-11 09:27:46 +08:00
zhanghongtong
3604593b86 chore(CI): use emqx otp in mac by kerl build 2021-06-10 14:28:57 +08:00
zhanghongtong
1098df815a chore(CI): fix relup error 2021-06-10 09:25:37 +08:00
turtleDeng
a564e0c4bf
Merge pull request #4947 from emqx/dev/v5.0
Merge dev/v5.0 to master
2021-06-07 17:26:38 +08:00
zhanghongtong
5d30e52e73 chore(CI): fix error for sync code to enterprise 2021-06-07 16:02:01 +08:00
zhanghongtong
d5366c7f5f chore(CI): change base branch to sync enterprise 2021-06-07 15:47:37 +08:00
Zaiming Shi
045a944192 chore(ci): check emqx app standalone 2021-06-07 09:09:28 +02:00
Zaiming Shi
948ff66111 test: fix rebar3 eunit arg
--dir apps/app_name causes rebar3 to crash because eunit handler
injects a `[]` as one of the extra_src_dirs option
2021-06-07 09:09:28 +02:00
Zaiming (Stone) Shi
729e9697cd
Merge pull request #4943 from emqx/master
Auto-pull-request-on-2021-06-05
2021-06-07 09:05:42 +02:00
Zaiming Shi
e01222ef21 build: build macos package on correct OTP release 2021-06-05 19:53:56 +02:00
zhanghongtong
8f936e3839 chore(CI): remove raspbian9 in build packages workflows 2021-06-05 23:28:28 +08:00
zhanghongtong
7d0324fb1b chore(CI): fix download packages error in build packages 2021-06-05 18:57:00 +08:00
Zaiming (Stone) Shi
5dab6985c1
Merge branch 'dev/v5.0' into resolve-master-dev/v5.0-conflict-release-version 2021-06-05 11:51:02 +02:00
zhanghongtong
d5059a2a37 chore(CI): fix download packages error in build packages 2021-06-05 17:49:27 +08:00
tigercl
12bab3716b
Merge pull request #4936 from Rory-Z/chore/change-trigger
chore(CI): update events that trigger workflows
2021-06-05 14:54:41 +08:00
zhanghongtong
d825535d04 chore(CI): update events that trigger workflows 2021-06-05 14:09:12 +08:00
zhanghongtong
2052521715 chore(CI): fix relup error in enterprise 2021-06-05 01:44:53 +08:00
zhanghongtong
2711dc6219 chore(CI): fix appup workflows 2021-06-05 00:59:23 +08:00
zhanghongtong
6c4f297192 chore(CI): update build packages workflows for appup 2021-06-04 21:32:00 +08:00
Zaiming (Stone) Shi
913420588d
Merge branch 'dev/v5.0' into resolve-conflict-to-5.0 2021-05-31 09:17:21 +02:00
JianBo He
3a89b1f00b
chore(action): fix syntax error (#4885) 2021-05-31 15:08:52 +08:00
Rory Z
11352c4eaa
chore(ci): use cache for macos in slim build (#4883) 2021-05-28 09:57:55 +08:00
zhanghongtong
a7d3dced5e chore(ci): ensure rebar3 in actions 2021-05-27 21:50:03 +08:00
Zaiming Shi
0424200978 build: ensure rebar3 in PATH for build_packages action 2021-05-27 12:42:21 +02:00
Zaiming Shi
925aa55951 build: add back macos erlang install cache 2021-05-27 16:18:17 +08:00
Zaiming Shi
0ac3e6e0ce build: ensure rebar3 in PATH 2021-05-27 16:18:17 +08:00
z8674558
31cbb7aa97 Merge branch 'master' of github.com:emqx/emqx into merge-master 2021-05-25 12:50:50 +09:00
Zaiming Shi
6015b4ac4a build: disable macos build cache for now 2021-05-24 21:12:15 +02:00
zhanghongtong
f2ccf97780 chore(CI): fix relup tests error in enterprise repo 2021-05-24 18:00:48 +08:00
zhanghongtong
09084e4e27 chore(CI): fix relup tests error in enterprise repo 2021-05-24 15:11:46 +08:00
Zaiming Shi
7a969e085f test: ensure erlang 23 in more github actions 2021-05-21 17:59:17 +02:00
Zaiming Shi
a8cb5678b5 test: ensure erlang 23 in github action 2021-05-21 16:48:01 +02:00
zhanghongtong
18036fdf3b chore(CI): show rebar3.crushdump when actions failed 2021-05-17 15:09:12 +08:00
zhanghongtong
db4a76fe75 chore(CI): relup test support any commit 2021-05-14 05:41:00 +09:00
Rory-Z
0788aa972f chore(CI): fix app version check 2021-05-14 05:41:00 +09:00
zhanghongtong
fb643fc53f chore(CI): add apps version check 2021-05-14 05:41:00 +09:00
z8674558
efe0c2fe1a fix(docker-entrypoint): do not mv loaded_plugins file, copy it by cat 2021-05-14 05:41:00 +09:00
zhanghongtong
0abdde0bad chore(CI): use cache for mac 2021-05-14 05:41:00 +09:00
Turtle
7ef173f2c2 chore(slim): fix build silm macosx fail 2021-05-14 05:41:00 +09:00
zhanghongtong
b288710429 chore(CI): update build workflows 2021-05-14 05:41:00 +09:00
zhanghongtong
9c244679dc chore(CI): relup test support any commit 2021-05-13 19:05:34 +08:00
Rory-Z
0bf76adfd5 chore(CI): fix app version check 2021-05-12 10:34:54 +08:00
zhanghongtong
bb490e7d6e chore(CI): add apps version check 2021-05-11 09:07:48 +08:00
z8674558
50f4e0617b fix(docker-entrypoint): do not mv loaded_plugins file, copy it by cat 2021-05-10 20:54:33 +09:00
zhanghongtong
29bbc0802b chore(CI): use cache for mac 2021-05-09 10:58:00 +08:00
Turtle
a07fece436 chore(slim): fix build silm macosx fail 2021-05-08 21:32:16 +08:00
zhanghongtong
934d3c405d chore(CI): update build workflows 2021-05-08 13:57:02 +08:00
Zaiming Shi
814588d1c8 Merge remote-tracking branch 'origin/master' into resolve-conflict-master-to-v5.0 2021-05-07 22:24:38 +02:00
Zaiming Shi
05324dfd7c build(ci): download old versions 2021-05-07 21:25:10 +02:00