yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,802 Commits 393 Branches 684 Tags 74 MiB
Commit Graph

335 Commits

Author SHA1 Message Date
DDDHuang ece789b58e fix(ci): update jmeter to 5.4.3 2022-03-20 13:07:43 +08:00
Zaiming (Stone) Shi 87a2155fb5 Merge remote-tracking branch 'origin/main-v4.3' into main-v4.4 2022-03-05 10:40:03 +01:00
Zaiming (Stone) Shi 7ba3d32bac ci: remove git-token file since EE dashboard is opensource now 2022-03-05 09:44:12 +01:00
zhanghongtong a27ff13ceb ci(release): update container image 2022-03-04 21:08:29 +08:00
zhanghongtong cb969b5493 Merge branch 'main-v4.4' of https://github.com/emqx/emqx into merge-4.3-to-4.4 2022-03-04 20:51:38 +08:00
Rory Z d0b5b262fe
Merge pull request #7115 from Rory-Z/ci/update-build 
ci(cross build): splitting cross builds and upload assets
 2022-03-04 09:20:15 +08:00
JianBo He c5a6b47390 build(ci): fix package name 2022-03-03 11:57:17 +08:00
JianBo He f0be91b7fd Merge remote-tracking branch 'ce/main-v4.3' into merge-main-v4.3-into-v4.4 2022-03-03 11:13:45 +08:00
Zaiming (Stone) Shi 8029670741 ci: add appup update check to ci 2022-03-01 17:04:09 +01:00
Zaiming (Stone) Shi fe597cd3f9 ci: delete ci step which creates sha256sum 
the latest build commands create sha256 sum right after the build
e.g. command `make emqx-zip` creates two files:
- emqx-<version>.zip
- emqx-<version>.zip.sha256
 2022-02-28 18:55:05 +01:00
Zaiming (Stone) Shi c157a16907 Merge remote-tracking branch 'origin/main-v4.3' into main-v4.4 2022-02-26 01:05:06 +01:00
zhanghongtong b6e57b1789 ci(cross build): splitting cross builds and upload assets 2022-02-23 15:27:32 +08:00
Zaiming (Stone) Shi 43c900bb5a chore: rename more descriptive EQM X to EMQX 2022-02-22 11:16:38 +01:00
JianBo He 521bdd20b4 Merge remote-tracking branch 'ce/main-v4.3' into merge-main-v4.3-into-v4.4 2022-02-22 11:43:46 +08:00
Zaiming (Stone) Shi 3c22878d54 ci: update windows ci to use erlef action and add windows to slim build 2022-02-21 15:09:32 +01:00
Zaiming (Stone) Shi 3a5a2047e9 build: fix windows build 2022-02-21 00:53:56 +01:00
Ilya Averyanov 557c52dd8a chore(codestyle): remove Elvis 2022-02-18 20:35:19 +03:00
zhanghongtong ee7acdfc33 ci(cross build): fix build raspbian failed on armhf 2022-02-17 15:52:36 +08:00
Rory Z 545abe2d52
Merge pull request #7006 from Rory-Z/ci/update-target-event 
ci(build_packages): add target event
 2022-02-17 09:33:17 +08:00
zhanghongtong 091398d863 build(relup): add new script for download relup base packages 2022-02-15 17:57:31 +08:00
zhanghongtong 88769bc23b ci(build_packages): cancel repeating actions 2022-02-15 10:15:25 +08:00
zhanghongtong c1f77da3b9 ci(build_packages): add target event 2022-02-15 10:11:34 +08:00
JianBo He a88dd4aaa5 Merge tag 'v4.3.12' into main-v4.4 2022-02-14 19:37:59 +08:00
Zaiming (Stone) Shi f1b10ec2b0
Merge pull request #6927 from Rory-Z/ci/push-multiarch-image-for-aws 
ci(build_packages): push muilt arch image for aws ecr
 2022-02-14 12:26:56 +01:00
Zaiming (Stone) Shi 9f897a650a build: rename distro from 'rhel' to 'el' 2022-02-14 09:28:29 +01:00
zhanghongtong 7a45ad8900 chore: fix a few typos 2022-02-13 20:50:35 +08:00
zhanghongtong e9238c6ca3 ci: use exclude instead of include for build matrix 2022-02-13 12:51:53 +08:00
Zaiming (Stone) Shi dfb591cac7 ci: use exclude instead of include for build matrix 
include is unconditional, as a result, it brins in emqx profile
to enterprise repo
 2022-02-12 14:32:54 +01:00
Zaiming (Stone) Shi 5171d3811c ci: revert to openssl digest for sha256 sum on mac 2022-02-12 12:24:48 +01:00
Zaiming (Stone) Shi 857e9aee52 ci: fix sha256sum in windows 
for some reason Get-FileHash (or maybe later piped tools) produced
non-text content
 2022-02-12 10:48:28 +01:00
Zaiming (Stone) Shi 257f6cc589 ci: fix action typo repository -> registry 2022-02-11 21:24:40 +01:00
Zaiming (Stone) Shi 28508e23ec ci: dump logs when failed to stop 2022-02-11 15:20:15 +01:00
zhanghongtong fd9b787e9d ci(build_packages): push muilt arch image for aws ecr 
done #6870
 2022-02-10 09:38:23 +08:00
zhanghongtong ec0843633c chore: change step name to match the actual commands 2022-02-10 09:36:16 +08:00
zhanghongtong c316cc464f ci(build_packages): push muilt arch image for aws ecr 2022-02-10 09:34:15 +08:00
Zaiming (Stone) Shi fd75756d5c ci: update to emqx-builder 4.4-5 (rockylinux) 2022-02-09 22:49:08 +01:00
Zaiming (Stone) Shi 4f6876b6e9 ci: package slim-build on rockylinux 2022-02-09 22:16:39 +01:00
Zaiming (Stone) Shi d863609f43 build: use rockylinux and 'rhel' for package names 2022-02-09 22:13:00 +01:00
Ilya Averyanov c1d2be3bff Merge branch 'main-v4.3' into rebar3-vs-make-4.4 
* main-v4.3:
  chore(ci): use make apps/emqx_auth_ldap-ct instead of rebar command
 2022-02-08 14:48:19 +03:00
Ilya Averyanov 1480efde19 chore(ci): use make apps/emqx_auth_ldap-ct instead of rebar command 2022-02-07 21:55:30 +03:00
Shawn 791b22f151
Merge branch 'main-v4.4' into copy_of_main-v4.3 2022-01-27 18:46:49 +08:00
Zaiming (Stone) Shi e5d196569c ci: find relup base version using script scripts/relup-base-vsns.sh 2022-01-26 18:26:43 +01:00
Zaiming (Stone) Shi 99712d3521 ci: debug windows build 2022-01-26 12:08:32 +01:00
Shawn 301d6bf794 fix(ci): add some debug print for downloading rebar3 2022-01-26 18:55:17 +08:00
Zaiming (Stone) Shi 16a5eb4493 Merge remote-tracking branch 'origin/main-v4.3' into merge-v4.3-to-v4.4 2022-01-25 22:29:01 +01:00
Zaiming (Stone) Shi 95f950ae00 ci: fix relup base version match pattern 2022-01-25 19:04:55 +01:00
JianBo He e7b6ba509b Merge remote-tracking branch 'ce/main-v4.3' into merge-main-v4.3-into-v4.4 2022-01-24 09:29:20 +08:00
JimMoen cb6f7cb496 ci: fix a typo in fvt_tests 2022-01-21 19:53:49 +08:00
William Yang afa4c7d341 ci(mac): cache otp install only 
only cache otp installation instead of the entire kerl dir to save cache spaces
 2022-01-18 11:49:53 +01:00
William Yang deaea12aca ci(mac): cache otp install only 
only cache otp installation instead of the entire kerl dir to save cache spaces
 2022-01-18 11:19:32 +01:00
Shawn 1e3429986a fix(ci): download previous zip packages failed 2022-01-18 10:19:02 +08:00
JianBo He b297388c20 Merge branch 'main-v4.3' into merge-main-v4.3-into-v4.4 2022-01-11 10:03:28 +08:00
Zaiming (Stone) Shi 558db58b5d
Merge pull request #6643 from Rory-Z/ci/do-not-static-check-for-4.4 
ci(static checks): do not run static check
 2022-01-05 17:25:39 +01:00
Zaiming (Stone) Shi c761b1aa3c
Merge pull request #6644 from Rory-Z/ci/do-not-static-check-for-4.3 
ci(static checks): do not run static check
 2022-01-05 17:25:16 +01:00
zhanghongtong ced2a4a117 ci(static checks): do not run static check 2022-01-05 11:13:26 +08:00
zhanghongtong cf57b77f03 ci(static checks): do not run static check 2022-01-05 11:09:45 +08:00
Rory Z c672d8e7a4
Merge pull request #6627 from Rory-Z/chore/use-enterprise-dockerfile 
ci(build_packages): if it's enterprise, use Dockerfile.enterprise
 2022-01-05 10:37:23 +08:00
zhanghongtong 0b12a7e3a2 ci(build_packages): only push emqx broker to aws ecr 2022-01-05 10:12:27 +08:00
zhanghongtong 6a5c37dab7 ci(its): fix error 2022-01-04 21:03:46 +08:00
Rory Z afc0fcd0b6
Merge pull request #6628 from Rory-Z/chore/ignore-ldap-error 
chore(cts): ignore ldap error
 2022-01-04 18:21:56 +08:00
zhanghongtong 387af5295c chore(cts): ignore ldap error 2022-01-04 17:56:58 +08:00
Rory Z 7759d94d6b
Merge pull request #6524 from Rory-Z/ci/fix-upload-error 
ci(build_packages): fix upload error for mac
 2022-01-04 17:32:37 +08:00
zhanghongtong 8e88f8b9f9 ci(build_packages): if it's enterprise, use Dockerfile.enterprise 
Signed-off-by: zhanghongtong <rory-z@outlook.com>
 2022-01-04 16:45:16 +08:00
zhanghongtong 514634e541 ci(build_packages): if it's enterprise, use Dockerfile.enterprise 2022-01-04 16:32:32 +08:00
zhanghongtong 1627ef78e7 ci(build_packages): update docker build 
Signed-off-by: zhanghongtong <rory-z@outlook.com>
 2022-01-04 14:27:39 +08:00
zhanghongtong 02d347d4ea ci(build_packages): delete needless steps 2022-01-04 10:49:00 +08:00
Zaiming (Stone) Shi feecaa6c98 build: ci tests.sh test specific package 2021-12-31 15:35:31 +01:00
zhanghongtong 499c1ab2f4 ci(build_packages): fix upload error for mac 2021-12-23 00:02:42 +08:00
zhanghongtong 1136b16281 ci(build_packages): fix docker tag error 2021-12-22 21:11:19 +08:00
zhanghongtong 67f4bba694 ci(build_packages): delete needless packages 2021-12-22 20:26:06 +08:00
zhanghongtong 5fbd999ef8 ci(cts): fix env error 2021-12-22 16:48:42 +08:00
zhanghongtong a560174ad9 ci(cts): use makefile target instead of the rebar command 2021-12-22 16:46:58 +08:00
zhanghongtong 15f40889c6 ci(cts): fix env error 2021-12-22 16:01:58 +08:00
Shawn e15eadde72 fix(test): revert the changes on ldap ct 2021-12-22 12:00:45 +08:00
zhanghongtong f5ec6b730c ci(cts): fix spell error 2021-12-22 10:22:56 +08:00
zhanghongtong c1480ab52c ci(cts): use makefile target instead of the rebar command 2021-12-22 09:40:09 +08:00
zhanghongtong f78be5a4be ci(release): only push emqx broker image to aws ecr 2021-12-20 10:25:23 +08:00
tigercl de7d510552
Merge pull request #6421 from Rory-Z/chore/bump-otp-version 
ci: bump otp version to 24.1.5-3
 2021-12-17 18:16:03 +08:00
tigercl a585536a3b
Merge pull request #6468 from emqx/main-v4.3 
Sync v4.3 to v4.4
 2021-12-17 13:37:55 +08:00
xiangfangyang-tech 2da7f91c42 chore(autotest): improve jmeter installation mode 2021-12-17 10:50:58 +08:00
xiangfangyang-tech 0e9b608737 chore(autotest): improve pgsql script and change file path in emqx-fvt warehouse 2021-12-17 10:33:33 +08:00
zhanghongtong baf8d7d91c ci: bump otp version to 24.1.5-3 2021-12-14 10:45:08 +08:00
tigercl 2ed5e01054
Merge branch 'main-v4.4' into sync-from-v4.3 2021-12-09 18:49:38 +08:00
tigercl 42cfc6c5e6
Merge pull request #6272 from Rory-Z/ci/add-push-ecr-for-4.4 
ci: add new steps for push ecr image when release
 2021-12-09 16:05:17 +08:00
Rory Z cdc70d8ccc
Merge pull request #6271 from Rory-Z/ci/add-push-ecr-for-4.3 
ci: add new steps for push ecr image when release
 2021-12-08 17:30:44 +08:00
zhanghongtong e7c765aaa3 chore(helm): support cluster discovery by dns 2021-12-07 16:23:19 +08:00
zhanghongtong b87ed0666c ci: add new steps for push ecr image when release 2021-11-23 17:54:17 +08:00
zhanghongtong 5a3169b83a ci: add new steps for push ecr image when release 2021-11-23 17:36:27 +08:00
Zaiming (Stone) Shi 2514f474b0
Sync v4.3 to v4.4 (#6262) 
* fix(http): fix duplicate http headers

* chore(appup): add appup.src

* fix(appup): fix multiply defined module in appup

* chore(appup): fix wrong version

* chore(ekka): Bump version to 0.8.1.5

* fix(update_appup): Fix warnings, add support for external repos

* build: use find command's -delete option

* ci: do not sync master branch

* build: ensure openssl11

* build: copy only libcrypto and libtinfo

* fix(trace): handler_id now always return atom

Co-authored-by: zhouzb <zhouzb@emqx.io>
Co-authored-by: k32 <10274441+k32@users.noreply.github.com>
 2021-11-23 09:33:20 +08:00
Zaiming Shi 1cb6cdbd76 build: upgrade to otp sed 23.2.7.2-emqx-3 
There was a typo fix in ssl app for ecdsa_secp512r1_sha512
to ecdsa_secp521r1_sha512.

Hot-beam upgrade is supported when upgrading from OTP 23.2.7.2-emqx-2
just a 'ssl_cipher' module reload.
 2021-11-20 23:28:12 +01:00
Zaiming Shi 099e2a8752 ci: port changes made in master branch 2021-11-19 23:03:06 +01:00
Zaiming (Stone) Shi ef41361753
Merge pull request #6233 from zmstone/ci-do-not-sync-master-branch 
ci: do not sync master branch
 2021-11-19 13:46:11 +01:00
Zaiming Shi f1aaed9276 ci: do not sync master branch 2021-11-19 08:46:53 +01:00
zhanghongtong d1cf526f34 ci: fix permission error when check sha256 2021-11-18 14:45:00 +08:00
zhanghongtong 093a93a7ec ci: fix not found package when check sha256 2021-11-18 14:27:37 +08:00
zhanghongtong eb0f4a543d ci: fix upload artifact error 2021-11-18 10:35:03 +08:00
zhanghongtong 834240a760 ci: cancel otp vsn for docker image tag 
add otp vsn for docker labels
 2021-11-17 15:30:44 +08:00
zhanghongtong 45965a3e71 ci: update emqx-ci-helper version 2021-11-17 14:43:03 +08:00
zhanghongtong 39c564c072 ci: rename windows packae 2021-11-16 17:56:33 +08:00
zhanghongtong 2251159c4f build: pin otp version to 23.3.4.9-3 and builder version to 4.4-2 2021-11-16 17:56:33 +08:00