Commit Graph

270 Commits

Author SHA1 Message Date
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
Zaiming (Stone) Shi 3944888a19 chore: update-appup.sh always rebuild baseline
Reasons
* OTP version might be different in developer's env and build env
* For some tags, we do not build release. e.g. rel-v4.4.X
2022-03-24 11:23:47 +01:00
JianBo He 65e11bcb01 chore: bump vsn for 4.4.2-rc.1 2022-03-24 14:26:52 +08:00
JianBo He 5e42a67c8d chore: update dashboard vsn 2022-03-24 14:22:19 +08:00
Zaiming (Stone) Shi 8415abb05a Merge remote-tracking branch 'origin/main-v4.4' into main-v4.4 2022-03-22 21:01:15 +01:00
Zaiming (Stone) Shi 6ea8d2f270 Merge remote-tracking branch 'origin/main-v4.3' into main-v4.4 2022-03-22 20:54:22 +01:00
Zaiming (Stone) Shi ed9266b6c0 ci: update to latest builder image 2022-03-22 12:05:55 +01:00
Zaiming Shi 13086e7259 chore: fix update-appup.sh for bash 3.2 2022-03-19 08:42:52 +01:00
JianBo He af65310ce7 chore(script): update_appup.escript support the update cmd
We often use the advanced directive `update` when hot upgrading
gen_server, gen_statem, and other such processes, and it will be
parsed as:
```
{suspend,[Mod]},
{load,{Mod,brutal_purge,brutal_purge}},
{code_change,up,[{Mod,[Extra]}]},
{resume,[Mod]},
```
So, we should treat the update instruction as having completed the
upgrade of this module.
2022-03-15 10:51:30 +08:00
Zaiming (Stone) Shi cedeff4dab build(appup): fix module delete instructions
when there is a application_restart instruction, there is no
need to add module delete instructions
2022-03-09 11:18:02 +01:00
Zaiming (Stone) Shi 27617539f1 fix(appup): adjust update-appup.sh for 4.4. 2022-03-08 19:31:21 +01:00
Zaiming (Stone) Shi 571456b3c4 Merge remote-tracking branch 'origin/main-v4.3' into main-v4.4 2022-03-08 18:59:38 +01:00
Zaiming (Stone) Shi d8e29f19cb refactor(appup): always generate appup from script 2022-03-08 13:24:54 +01:00
Zaiming (Stone) Shi 111b93b4ea fix(update-appup): pass in --repo option even when download bin package
the repo url is NOT used to clone the source,
but used to determin the sub-dir name when extracting the zip package
2022-03-05 17:24:49 +01:00
Zaiming (Stone) Shi 1ae46cc22a build(appup): exclude gpb from appup checks 2022-03-05 16:49:58 +01:00
Zaiming (Stone) Shi 0a6e2d596b build: fix update-appup for ee 2022-03-05 11:49:44 +01:00
Zaiming (Stone) Shi 521f47ff80 build: add 4.4 dashboard download 2022-03-05 10:46:56 +01: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 c6660084f8 build: one place for dashboard version 2022-03-05 09:44:12 +01: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
Zaiming (Stone) Shi 3b22efeb9c build(update_appup): handle add_module instruction 2022-03-04 12:30:46 +01: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 558748dab2 build(update_appup): only download package if not exist 2022-03-02 19:38:25 +01:00
Zaiming (Stone) Shi b0900fe25a build(update-appup): fix ARCH resolution 2022-03-02 19:37:11 +01:00
Shawn 8be8f538a1 fix(relup): verify emqx_relup call in upgrade and downgrade clauses 2022-03-02 11:56:44 +08:00
Shawn 77e3c1d3ac feat(relup): support providing 'Extra' parameter from appup.src 2022-03-02 10:48:10 +08:00
Zaiming (Stone) Shi ef382bf34c chore: add --make-command to update_appup script args 2022-03-01 17:04:05 +01:00
Zaiming (Stone) Shi 0996b79d96 chore: add a script to simplify appup update 2022-03-01 17:02:29 +01:00
Shawn 41afbd2b13 refactor(relup): don't collect relvsn -> appvsn mappings 2022-03-01 23:10:11 +08:00
Shawn 769e79e2cd chore(relup): also inject emqx_app automatically 2022-03-01 16:19:58 +08:00
Shawn a7791b6c58 fix(relup): download to 4.4.0 failed with error bad_lib_vsn 2022-03-01 11:33:49 +08:00
Shawn bcd56d3db2 Merge branch 'main-v4.4' into inject_relup_instructions_v4.4 2022-02-28 19:13:55 +08:00
Shawn f25b8801b4 fix(build): also make SYSTEM configurable by env variable 2022-02-28 19:07:38 +08:00
Zaiming (Stone) Shi bbbb0edca1 chore: skip downloading upgrade base images for windows
because we do not support relup for windows for now
2022-02-27 14:56:46 +01:00
Shawn 28bd2fcfa4 fix(relup): release upgrade failed with {bad_lib_vsn,emqx,"4.4.2"} 2022-02-27 20:04:21 +08:00
Shawn 17440b2b53 fix(relup): add module emqx_relup 2022-02-27 10:25:57 +08:00
Shawn 2365d1e983 fix(relup): inject relup only for the current rel vsn 2022-02-27 10:11:02 +08:00
Zaiming (Stone) Shi 8654600ea2 fix(update_appup): use curl command instead of wget 2022-02-26 17:00:47 +01:00
Zaiming (Stone) Shi 0931a426cd chore(update_appup.escript): make it work with dirty src dirs 2022-02-26 16:44:11 +01:00
Shawn 692d1e2a33 fix(relup): OTP_VSN: unbound variable 2022-02-26 21:31:09 +08:00
Shawn 91c46de4aa fix(relup): inject relup instructions to the end of relup file 2022-02-26 21:10:20 +08:00
Zaiming (Stone) Shi 4473a832bc build: fix macos -> macos* so matches macos10 and macos11 2022-02-22 09:43:06 +01:00
Zaiming (Stone) Shi fb7944391d build: fix shellcheck 2022-02-22 09:40:32 +01:00
JianBo He 18feec9030 chore(ci): fix the download filename 2022-02-22 13:43:46 +08: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 5e3543e282
Merge pull request #7073 from zmstone/fix-find-command-for-4.3-and-4.4
build: fix find command for windows
2022-02-21 12:23:42 +01:00
Zaiming (Stone) Shi 107e447de4 build: fix find command for windows
windows has its own find command
2022-02-21 09:17:45 +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
Shawn 3bd961ca73 fix(CI): remove e|v from downloading urls of emqx packages 2022-02-18 23:05:35 +08:00
Shawn 3690d1951e chore: add more debug info for relup-base-packages.sh 2022-02-18 22:41:03 +08:00
Zaiming (Stone) Shi cc1734490f chore: trigger a version check before pushing a tag 2022-02-17 11:20:19 +01:00
Xinyu Liu 09c5114d42
Merge pull request #7042 from Rory-Z/ci/fix-cross-build-fail
ci(cross build): fix build raspbian failed on armhf
2022-02-17 16:52:17 +08:00
zhanghongtong ee7acdfc33 ci(cross build): fix build raspbian failed on armhf 2022-02-17 15:52:36 +08:00
Xinyu Liu 1b5986a5e1
Merge pull request #7044 from terry-xiaoyu/fix_windows_build
fix(build): change header of shell script to "#!/usr/bin/env bash"
2022-02-17 15:33:34 +08:00
Shawn 037b9e440c fix(build): change header of shell script to "#!/usr/bin/env bash" 2022-02-17 15:21:17 +08:00