Commit Graph

226 Commits

Author SHA1 Message Date
Shawn a365c40765 chore: update dashboard version 2022-06-28 10:39:37 +08:00
Xinyu Liu 6a9b68f9ef
Merge pull request #8334 from emqx/main-v4.3
merge main-v4.3 into main-v4.4
2022-06-28 10:36:42 +08:00
Shawn 343770ce52 chore: update dashboard version 2022-06-28 10:29:01 +08:00
Thales Macedo Garitezi b93a0743ac Merge branch 'main-v4.3' into 'main-v4.4' 2022-06-15 10:48:02 -03:00
Zaiming (Stone) Shi 3a17fb2522
Merge pull request #8204 from zmstone/0612-build-exclude-sub-build-dirs
build: add strict-semver version bump check for apps
2022-06-13 19:33:06 +01:00
Zaiming (Stone) Shi 100aeda83b build: add strict-semver version bump check for apps 2022-06-13 17:46:06 +02:00
Zaiming (Stone) Shi 215286760a build: ignore _build sub-dir in release dir 2022-06-12 21:07:13 +02:00
Thales Macedo Garitezi 6a5c896f56
ci(relup): fix: follow URL redirects when checking for package existence 2022-06-09 11:51:02 -03:00
JianBo He 25be198d2a Merge tag 'v4.3.15-rc.4' into merge-main-v4.3-into-v4.4 2022-05-31 22:07:57 +08:00
DDDHuang a96984d280 feat: dashboard v4.4.11 for ee 4.4.4 2022-05-30 11:34:55 +08:00
DDDHuang e1150e36a2 feat: dashboard v4.3.20 for ee 4.3.10 2022-05-30 11:30:23 +08:00
JianBo He 39518f5e27 Merge tag 'v4.4.3' into merge-main-v4.3-into-v4.4 2022-05-27 18:08:08 +08:00
Zaiming (Stone) Shi dbe4ff7b02 Merge tag 'v4.4.2' into rebuild-v4.4.3 2022-05-27 10:15:02 +02:00
JianBo He b0c00df867 Merge remote-tracking branch 'stone/0525-ci-pin-builder-4.4-12' into merge-main-v4.3-into-v4.4 2022-05-27 11:16:01 +08:00
Zaiming (Stone) Shi 3029e2b243 ci: For 4.4, release package on OTP 24 only 2022-05-27 03:16:57 +02:00
Zaiming (Stone) Shi 94092bc52e ci: ensure _build dir is owned by root
so the git command can run without safe.directory config for
cloned dependencies
2022-05-27 00:59:31 +02:00
Zaiming (Stone) Shi a403c9ff91 ci: pin emqx-buider 4.4-12
Centos/Rockylinux had troulbe booting because OpenSSL version
was too new (1.1.1n).

builder 4.4-12 has
* Centos7: only one version (1.1.1k) OpenSSL installed
* Centos8: go back to use default OpenSSL (1.1.1k)
2022-05-26 19:33:04 +02:00
Zaiming (Stone) Shi 29622558c5 ci: pin emqx-buider 4.4-12
Centos/Rockylinux had troulbe booting because OpenSSL version
was too new (1.1.1n).

builder 4.4-12 has
* Centos7: only one version (1.1.1k) OpenSSL installed
* Centos8: go back to use default OpenSSL (1.1.1k)
2022-05-26 18:04:01 +02:00
JianBo He c5349cef64 Merge remote-tracking branch 'ce/main-v4.3' into merge-main-v4.3-into-v4.4 2022-05-26 11:18:15 +08:00
Zaiming (Stone) Shi 1bebbd6ee5 fix(emqx_os_mon): ensure alarm is deactivated on unsupported platforms 2022-05-25 16:21:53 +02:00
Zaiming (Stone) Shi 0400638f71 feat(update_appup.escript): allow skipped versions
Say app current version is 1.1.2, and the compare baes is
version 1.1.1, but there is a 1.1.2 in appup.

We may skip updating appup instructions for 1.1.2
as it's never used, (at least not in EMQX)
2022-05-25 15:36:12 +02:00
Shawn 433d74254e chore: dashboard v4.4.10 2022-05-23 23:24:32 +08:00
Xinyu Liu 211fee3035
Merge branch 'main-v4.4' into copy-of_main-v4.3 2022-05-23 23:19:19 +08:00
Shawn 41331c5c1a chore: release 4.3.15-rc.1 2022-05-23 22:26:20 +08:00
Zaiming (Stone) Shi 4b0fe016f3 build(macos): do not depend on gsed 2022-05-07 08:35:46 +02:00
Zaiming (Stone) Shi ea7f845d9f Merge remote-tracking branch 'origin/main-v4.3' into main-v4.4 2022-04-29 20:21:44 +02:00
Thales Macedo Garitezi 0cfeca9d90
fix(update_appup): clean untracked nested git directories
Since the script copies the current workdir into the temporary
directory for the previous build, when we latter try to clean the
directory, `git clean -fdx` refuses to clean the folders of some
dependencies:

```
+ git clean -fdx
Skipping repository _build/default/lib/lc
```

So, if the branch contains a dependency with changed version, it'll
not be picked up by the script, as both versions will be identical and
hence have no `.appup` difference.
2022-04-28 11:09:25 -03:00
Zaiming (Stone) Shi 4330edd674 fix(appup): bump to 4.4.4-beta.1
also fix emqx appup instructions
2022-04-23 11:50:07 +02:00
Zaiming (Stone) Shi 42aa0e5d0a chore: add debug output to update-appup.sh 2022-04-23 10:43:58 +02:00
JimMoen 09a100fc2d chore: apps version check ignore comments in erl/hrl file 2022-04-16 12:10:52 +08:00
JimMoen 8f13a96788 chore: ignore comments and blank lines when app version checking 2022-04-14 11:23:25 +08:00
JianBo He f8080ed71b Merge tag 'v4.3.14-rc.2' into merge-main-v4.3-into-v4.4 2022-04-12 13:47:11 +08:00
Zaiming (Stone) Shi d205cb6fc0 build: make centos6 happy 2022-04-08 14:26:03 +02:00
JianBo He 7461484b9e Merge tag 'v4.3.14-rc.1' into merge-main-v4.3-into-v4.4
Version v4.3.14-rc.1
2022-04-08 19:29:30 +08:00
JimMoen 3c67947c82 chore: update dashboard for 4.4 2022-04-08 14:26:35 +08:00
JimMoen 7f5abdfd5b chore: update dashboard version 2022-04-08 14:22:53 +08:00
Zaiming (Stone) Shi f3a7c75871 Merge remote-tracking branch 'origin/main-v4.3' into dev/v4.4.3 2022-04-06 13:24:37 +02:00
Zaiming (Stone) Shi d6d232a7dd chore: make get-distro.sh aware of windows 2022-04-04 14:35:11 +02:00
Zaiming (Stone) Shi a54813dd69 fix(appup): re-generate appup from 4.3.13 2022-04-02 23:00:41 +02:00
JianBo He 610bfb7613 Merge tag 'v4.3.13-rc.3' into merge-main-v4.3-into-v4.4
Version v4.3.13-rc.3
2022-03-31 21:55:43 +08:00
Xinyu Liu 494eb3413c
Merge pull request #7475 from zmstone/main-v4.4
[4.4] update to builder images to 4.4-8
2022-03-31 18:49:25 +08:00
Zaiming (Stone) Shi 88c30e3a4f ci: bump to latest emqx-builder image 4.4-8 2022-03-31 10:14:01 +02:00
Zaiming (Stone) Shi 38447ff187 chore(appup): fix update-appup.sh
git reset before clean
2022-03-31 10:10:12 +02:00
Zaiming (Stone) Shi 48a65981af Merge remote-tracking branch 'origin/main-v4.3' into main-v4.4 2022-03-31 09:28:58 +02:00
Zaiming (Stone) Shi 59fae1714b chore: use shorter path 2022-03-28 14:10:33 +02:00
Zaiming (Stone) Shi 6ca0e63599 chore: fix appup update script
so it can handle switch between tags
2022-03-28 09:58:03 +02:00
Zaiming (Stone) Shi 489dbec76b ci: exclude 4.4.0 and 4.4.1 for debian11 2022-03-24 20:42:51 +01:00
Zaiming (Stone) Shi 4cf3cf7134 Merge remote-tracking branch 'origin/main-v4.3' into main-v4.4 2022-03-24 16:05:28 +01:00
Zaiming (Stone) Shi d3bcc201d6
Merge pull request #7401 from zmstone/ci-add-build-base-option-to-appup-update-script
chore: update-appup.sh always rebuild baseline
2022-03-24 15:58:25 +01:00
Zaiming (Stone) Shi b8afa16b53 chore: fix shellcheck 2022-03-24 12:28:34 +01:00