ef1b7e97bf
ci: use lux from emqx-builder/4.4-19:24.1.5-3-ubuntu20.04
2022-08-03 15:33:16 +02:00
f47d952d82
Merge main-4.3 to 0803-sync-v4.3-to-v4.4
2022-08-03 13:41:11 +02:00
ddd6f066e4
chore: run escript in compile mode
2022-08-03 10:41:45 +02:00
e74a97013e
build: fix relup app overwrite escript
...
the rel file name is always emqx.rel, has nothing to do with profile
2022-08-03 10:01:20 +02:00
a162196719
Merge pull request #8511 from qzhuyan/ci/william/4.3-new-otp-23.3
...
[WIP] ci: [4.3 only] release with OTP 23.3
2022-08-02 13:28:41 +01:00
8835296c7a
ci(rel): intro. rel_otp_apps.eterm
2022-08-02 09:59:33 +02:00
b17078b93f
fix(otp23.3): OTP app overwrites support emqx-edge
2022-08-02 09:59:33 +02:00
d2dda69729
chore: update dashboard vsn
2022-07-30 12:29:36 +08:00
499e794a59
Merge pull request #8614 from emqx/main-v4.3
...
Sync 4.3 to 4.4
2022-07-30 12:25:15 +08:00
3a62935205
chore: update dashboard vsn
2022-07-30 12:18:55 +08:00
3655ea050c
build(relup): overwrite OTP vers of upgrade bases
2022-07-23 00:46:47 +02:00
2ab2c39fdc
chore: update emqx-builder to 4.4-18
2022-07-20 15:21:00 +08:00
9512b31703
Merge branch 'main-v4.4' into sync-4.3-to-4.4
2022-07-19 16:06:52 +08:00
b400ccdeb4
chore(relup): download relup base version packages from s3
2022-07-19 15:09:04 +08:00
3248cb92e8
Merge branch 'main-v4.3' into sync-4.3-to-4.4
2022-07-19 11:02:11 +08:00
1180eca04d
chore: update dashboard version
2022-07-18 14:11:02 +08:00
2366794c2f
chore: update dashboard version
2022-07-18 14:09:27 +08:00
d2774935df
chore(relup): fix bad url
2022-07-12 14:50:59 +08:00
fe56985eec
chore(relup): download relup base version packages from s3
2022-07-12 14:30:50 +08:00
0e4626aab3
ci: app version check script should also check include dir
2022-07-02 11:35:47 +02:00
03649cc3f3
chore: copy `.tool-versions` when calculating appups
...
This can make it simpler to ensure the same OTP version that builds
the current checkout will match the one that builds the appup base,
since one may change the version locally.
2022-07-01 13:05:29 -03:00
a365c40765
chore: update dashboard version
2022-06-28 10:39:37 +08:00
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
343770ce52
chore: update dashboard version
2022-06-28 10:29:01 +08:00
b93a0743ac
Merge branch 'main-v4.3' into 'main-v4.4'
2022-06-15 10:48:02 -03:00
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
100aeda83b
build: add strict-semver version bump check for apps
2022-06-13 17:46:06 +02:00
215286760a
build: ignore _build sub-dir in release dir
2022-06-12 21:07:13 +02:00
6a5c896f56
ci(relup): fix: follow URL redirects when checking for package existence
2022-06-09 11:51:02 -03:00
25be198d2a
Merge tag 'v4.3.15-rc.4' into merge-main-v4.3-into-v4.4
2022-05-31 22:07:57 +08:00
a96984d280
feat: dashboard v4.4.11 for ee 4.4.4
2022-05-30 11:34:55 +08:00
e1150e36a2
feat: dashboard v4.3.20 for ee 4.3.10
2022-05-30 11:30:23 +08:00
39518f5e27
Merge tag 'v4.4.3' into merge-main-v4.3-into-v4.4
2022-05-27 18:08:08 +08:00
dbe4ff7b02
Merge tag 'v4.4.2' into rebuild-v4.4.3
2022-05-27 10:15:02 +02:00
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
3029e2b243
ci: For 4.4, release package on OTP 24 only
2022-05-27 03:16:57 +02:00
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
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
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
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
1bebbd6ee5
fix(emqx_os_mon): ensure alarm is deactivated on unsupported platforms
2022-05-25 16:21:53 +02:00
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
433d74254e
chore: dashboard v4.4.10
2022-05-23 23:24:32 +08:00
211fee3035
Merge branch 'main-v4.4' into copy-of_main-v4.3
2022-05-23 23:19:19 +08:00
41331c5c1a
chore: release 4.3.15-rc.1
2022-05-23 22:26:20 +08:00
4b0fe016f3
build(macos): do not depend on gsed
2022-05-07 08:35:46 +02:00
ea7f845d9f
Merge remote-tracking branch 'origin/main-v4.3' into main-v4.4
2022-04-29 20:21:44 +02:00
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
4330edd674
fix(appup): bump to 4.4.4-beta.1
...
also fix emqx appup instructions
2022-04-23 11:50:07 +02:00
42aa0e5d0a
chore: add debug output to update-appup.sh
2022-04-23 10:43:58 +02:00
09a100fc2d
chore: apps version check ignore comments in erl/hrl file
2022-04-16 12:10:52 +08:00
8f13a96788
chore: ignore comments and blank lines when app version checking
2022-04-14 11:23:25 +08:00
f8080ed71b
Merge tag 'v4.3.14-rc.2' into merge-main-v4.3-into-v4.4
2022-04-12 13:47:11 +08:00
d205cb6fc0
build: make centos6 happy
2022-04-08 14:26:03 +02:00
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
3c67947c82
chore: update dashboard for 4.4
2022-04-08 14:26:35 +08:00
7f5abdfd5b
chore: update dashboard version
2022-04-08 14:22:53 +08:00
f3a7c75871
Merge remote-tracking branch 'origin/main-v4.3' into dev/v4.4.3
2022-04-06 13:24:37 +02:00
d6d232a7dd
chore: make get-distro.sh aware of windows
2022-04-04 14:35:11 +02:00
a54813dd69
fix(appup): re-generate appup from 4.3.13
2022-04-02 23:00:41 +02:00
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
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
88c30e3a4f
ci: bump to latest emqx-builder image 4.4-8
2022-03-31 10:14:01 +02:00
38447ff187
chore(appup): fix update-appup.sh
...
git reset before clean
2022-03-31 10:10:12 +02:00
48a65981af
Merge remote-tracking branch 'origin/main-v4.3' into main-v4.4
2022-03-31 09:28:58 +02:00
59fae1714b
chore: use shorter path
2022-03-28 14:10:33 +02:00
6ca0e63599
chore: fix appup update script
...
so it can handle switch between tags
2022-03-28 09:58:03 +02:00
489dbec76b
ci: exclude 4.4.0 and 4.4.1 for debian11
2022-03-24 20:42:51 +01:00
4cf3cf7134
Merge remote-tracking branch 'origin/main-v4.3' into main-v4.4
2022-03-24 16:05:28 +01:00
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
b8afa16b53
chore: fix shellcheck
2022-03-24 12:28:34 +01:00
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
65e11bcb01
chore: bump vsn for 4.4.2-rc.1
2022-03-24 14:26:52 +08:00
5e42a67c8d
chore: update dashboard vsn
2022-03-24 14:22:19 +08:00
8415abb05a
Merge remote-tracking branch 'origin/main-v4.4' into main-v4.4
2022-03-22 21:01:15 +01:00
6ea8d2f270
Merge remote-tracking branch 'origin/main-v4.3' into main-v4.4
2022-03-22 20:54:22 +01:00
ed9266b6c0
ci: update to latest builder image
2022-03-22 12:05:55 +01:00
13086e7259
chore: fix update-appup.sh for bash 3.2
2022-03-19 08:42:52 +01:00
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
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
27617539f1
fix(appup): adjust update-appup.sh for 4.4.
2022-03-08 19:31:21 +01:00
571456b3c4
Merge remote-tracking branch 'origin/main-v4.3' into main-v4.4
2022-03-08 18:59:38 +01:00
d8e29f19cb
refactor(appup): always generate appup from script
2022-03-08 13:24:54 +01:00
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
1ae46cc22a
build(appup): exclude gpb from appup checks
2022-03-05 16:49:58 +01:00
0a6e2d596b
build: fix update-appup for ee
2022-03-05 11:49:44 +01:00
521f47ff80
build: add 4.4 dashboard download
2022-03-05 10:46:56 +01:00
87a2155fb5
Merge remote-tracking branch 'origin/main-v4.3' into main-v4.4
2022-03-05 10:40:03 +01:00
c6660084f8
build: one place for dashboard version
2022-03-05 09:44:12 +01:00
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
3b22efeb9c
build(update_appup): handle add_module instruction
2022-03-04 12:30:46 +01:00
c5a6b47390
build(ci): fix package name
2022-03-03 11:57:17 +08:00
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
558748dab2
build(update_appup): only download package if not exist
2022-03-02 19:38:25 +01:00
b0900fe25a
build(update-appup): fix ARCH resolution
2022-03-02 19:37:11 +01:00
8be8f538a1
fix(relup): verify emqx_relup call in upgrade and downgrade clauses
2022-03-02 11:56:44 +08:00
77e3c1d3ac
feat(relup): support providing 'Extra' parameter from appup.src
2022-03-02 10:48:10 +08:00
ef382bf34c
chore: add --make-command to update_appup script args
2022-03-01 17:04:05 +01:00
0996b79d96
chore: add a script to simplify appup update
2022-03-01 17:02:29 +01:00
41afbd2b13
refactor(relup): don't collect relvsn -> appvsn mappings
2022-03-01 23:10:11 +08:00
769e79e2cd
chore(relup): also inject emqx_app automatically
2022-03-01 16:19:58 +08:00
a7791b6c58
fix(relup): download to 4.4.0 failed with error bad_lib_vsn
2022-03-01 11:33:49 +08:00
bcd56d3db2
Merge branch 'main-v4.4' into inject_relup_instructions_v4.4
2022-02-28 19:13:55 +08:00
f25b8801b4
fix(build): also make SYSTEM configurable by env variable
2022-02-28 19:07:38 +08:00
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
28bd2fcfa4
fix(relup): release upgrade failed with {bad_lib_vsn,emqx,"4.4.2"}
2022-02-27 20:04:21 +08:00
17440b2b53
fix(relup): add module emqx_relup
2022-02-27 10:25:57 +08:00
2365d1e983
fix(relup): inject relup only for the current rel vsn
2022-02-27 10:11:02 +08:00
8654600ea2
fix(update_appup): use curl command instead of wget
2022-02-26 17:00:47 +01:00
0931a426cd
chore(update_appup.escript): make it work with dirty src dirs
2022-02-26 16:44:11 +01:00
692d1e2a33
fix(relup): OTP_VSN: unbound variable
2022-02-26 21:31:09 +08:00
91c46de4aa
fix(relup): inject relup instructions to the end of relup file
2022-02-26 21:10:20 +08:00
4473a832bc
build: fix macos -> macos* so matches macos10 and macos11
2022-02-22 09:43:06 +01:00
fb7944391d
build: fix shellcheck
2022-02-22 09:40:32 +01:00
18feec9030
chore(ci): fix the download filename
2022-02-22 13:43:46 +08:00
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
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
107e447de4
build: fix find command for windows
...
windows has its own find command
2022-02-21 09:17:45 +01:00
3a5a2047e9
build: fix windows build
2022-02-21 00:53:56 +01:00
557c52dd8a
chore(codestyle): remove Elvis
2022-02-18 20:35:19 +03:00
3bd961ca73
fix(CI): remove e|v from downloading urls of emqx packages
2022-02-18 23:05:35 +08:00
3690d1951e
chore: add more debug info for relup-base-packages.sh
2022-02-18 22:41:03 +08:00
cc1734490f
chore: trigger a version check before pushing a tag
2022-02-17 11:20:19 +01:00
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
ee7acdfc33
ci(cross build): fix build raspbian failed on armhf
2022-02-17 15:52:36 +08:00
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
037b9e440c
fix(build): change header of shell script to "#!/usr/bin/env bash"
2022-02-17 15:21:17 +08:00
62dd815807
chore(scripts): make shellcheck happy
2022-02-16 16:16:35 +01:00
538f843f14
fix(relup-base-packages.sh): download per release edition
2022-02-16 16:16:10 +01:00
f7135433be
chore(relup-base-vsns.sh): rename PROFILE to EDITION
...
to avoid confusion with rebar profile
2022-02-16 14:10:43 +01:00
4775ea353d
chore: update scripts/apps-version-check.sh
...
Co-authored-by: k32 <10274441+k32@users.noreply.github.com>
2022-02-16 19:41:17 +08:00
e7ce4ed215
chore: force check for version upgrade of emqx_dashboard
...
same with: https://github.com/emqx/emqx/pull/5879
2022-02-16 18:38:55 +08:00
149fe7bcdf
Merge pull request #7010 from Rory-Z/build/add-new-script
...
build(relup): add new script for download relup base packages
2022-02-16 15:57:25 +08:00
2acdc64b9d
style(script): rename variable name
2022-02-16 14:52:31 +08:00
d2840a8aa1
docs: change EMQ X to EMQX in more descriptive info
2022-02-15 22:18:25 +01:00
091398d863
build(relup): add new script for download relup base packages
2022-02-15 17:57:31 +08:00
22ae8985c6
chore: compare to rel-* versions for appup
2022-02-14 22:18:53 +01:00
9f897a650a
build: rename distro from 'rhel' to 'el'
2022-02-14 09:28:29 +01:00
fd75756d5c
ci: update to emqx-builder 4.4-5 (rockylinux)
2022-02-09 22:49:08 +01:00
d863609f43
build: use rockylinux and 'rhel' for package names
2022-02-09 22:13:00 +01:00
791b22f151
Merge branch 'main-v4.4' into copy_of_main-v4.3
2022-01-27 18:46:49 +08:00
e5d196569c
ci: find relup base version using script scripts/relup-base-vsns.sh
2022-01-26 18:26:43 +01:00
301d6bf794
fix(ci): add some debug print for downloading rebar3
2022-01-26 18:55:17 +08:00
362147924d
fix(build): only use rebar3 3.18.0-emqx-1 for OTP 24
2022-01-25 11:02:39 +08:00
d422e6e700
fix(build): relup for otp24 failed
...
The defination of `#application{}` record in systools.hrl is changed in OTP 24.
So we need a rebar3 binary compiled with OTP 24.
2022-01-24 18:04:40 +08:00
b297388c20
Merge branch 'main-v4.3' into merge-main-v4.3-into-v4.4
2022-01-11 10:03:28 +08:00
feecaa6c98
build: ci tests.sh test specific package
2021-12-31 15:35:31 +01:00
a21dade927
build: add scripts/buildx
2021-12-30 01:00:56 +01:00
5a6225d397
Merge pull request #6480 from emqx/improve-update-appup-43
...
chore(update_appup): Improve `update_appup.escript`
2021-12-28 09:54:52 -03:00
967dc7d55e
fix: portable shebang
2021-12-27 15:40:25 +01:00
Zaiming (Stone) Shi