From cd06edf8c8112666ec98478525518208f943611d Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Thu, 31 Mar 2022 18:30:20 +0200 Subject: [PATCH 1/7] fix(relup): upgrader node hidden connect target node --- bin/install_upgrade.escript | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bin/install_upgrade.escript b/bin/install_upgrade.escript index ae89ea724..2489ceed5 100755 --- a/bin/install_upgrade.escript +++ b/bin/install_upgrade.escript @@ -392,8 +392,7 @@ start_distribution(TargetNode, NameTypeArg, Cookie) -> MyNode = make_script_node(TargetNode), {ok, _Pid} = net_kernel:start([MyNode, get_name_type(NameTypeArg)]), erlang:set_cookie(node(), Cookie), - case {net_kernel:connect_node(TargetNode), - net_adm:ping(TargetNode)} of + case {net_kernel:hidden_connect_node(TargetNode), net_adm:ping(TargetNode)} of {true, pong} -> ok; {_, pang} -> From 8785f874738bc52d55867a1ef44b7793328d82e0 Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Thu, 31 Mar 2022 18:53:53 +0200 Subject: [PATCH 2/7] ci: upgrade erlang for windows --- .github/workflows/build_packages.yaml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build_packages.yaml b/.github/workflows/build_packages.yaml index bf70f7546..f8afde04c 100644 --- a/.github/workflows/build_packages.yaml +++ b/.github/workflows/build_packages.yaml @@ -57,13 +57,13 @@ jobs: windows: runs-on: windows-2019 - needs: prepare if: endsWith(github.repository, 'emqx') - strategy: matrix: profile: ${{fromJSON(needs.prepare.outputs.profiles)}} + otp: + - 23.3.4.13 exclude: - profile: emqx-edge @@ -75,18 +75,15 @@ jobs: - name: unzip source code run: Expand-Archive -Path source.zip -DestinationPath ./ - uses: ilammy/msvc-dev-cmd@v1 - - uses: gleam-lang/setup-erlang@v1.1.0 - id: install_erlang + - uses: erlef/setup-beam@v1 with: - otp-version: 23.2 + otp-version: ${{ matrix.otp }} - name: build env: PYTHON: python DIAGNOSTIC: 1 run: | - $env:PATH = "${{ steps.install_erlang.outputs.erlpath }}\bin;$env:PATH" erl -eval "erlang:display(crypto:info_lib())" -s init stop - $version = $( "${{ github.ref }}" -replace "^(.*)/(.*)/" ) if ($version -match "^v[0-9]+\.[0-9]+(\.[0-9]+)?") { $regex = "[0-9]+\.[0-9]+(-alpha|-beta|-rc)?\.[0-9]+" @@ -102,9 +99,6 @@ jobs: Remove-Item -Force -Path rebar.lock } make ensure-rebar3 - copy rebar3 "${{ steps.install_erlang.outputs.erlpath }}\bin" - ls "${{ steps.install_erlang.outputs.erlpath }}\bin" - rebar3 --help make ${{ matrix.profile }} mkdir -p _packages/${{ matrix.profile }} Compress-Archive -Path _build/${{ matrix.profile }}/rel/emqx -DestinationPath _build/${{ matrix.profile }}/rel/$pkg_name From ec0d43bcf7043cf146cc76f1805c308a4b9b73e3 Mon Sep 17 00:00:00 2001 From: Shawn <506895667@qq.com> Date: Fri, 1 Apr 2022 10:01:48 +0800 Subject: [PATCH 3/7] chore: release 4.3.13-rc.4 --- include/emqx_release.hrl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/emqx_release.hrl b/include/emqx_release.hrl index 60501474d..817aeee9b 100644 --- a/include/emqx_release.hrl +++ b/include/emqx_release.hrl @@ -29,7 +29,7 @@ -ifndef(EMQX_ENTERPRISE). --define(EMQX_RELEASE, {opensource, "4.3.13-rc.3"}). +-define(EMQX_RELEASE, {opensource, "4.3.13-rc.4"}). -else. From 1d2aa1c8c1b3e93a4dc1cbc284c513f43939c227 Mon Sep 17 00:00:00 2001 From: Shawn <506895667@qq.com> Date: Fri, 1 Apr 2022 17:55:43 +0800 Subject: [PATCH 4/7] chore: release 4.3.13 --- include/emqx_release.hrl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/emqx_release.hrl b/include/emqx_release.hrl index 817aeee9b..ddf28d5a3 100644 --- a/include/emqx_release.hrl +++ b/include/emqx_release.hrl @@ -29,7 +29,7 @@ -ifndef(EMQX_ENTERPRISE). --define(EMQX_RELEASE, {opensource, "4.3.13-rc.4"}). +-define(EMQX_RELEASE, {opensource, "4.3.13"}). -else. From e183ae249983cfbe8582aefbbffa5988281c2ae9 Mon Sep 17 00:00:00 2001 From: zhanghongtong Date: Sat, 2 Apr 2022 10:13:37 +0800 Subject: [PATCH 5/7] ci: push docker image when tag event --- .github/workflows/build_packages.yaml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_packages.yaml b/.github/workflows/build_packages.yaml index f8afde04c..fc2a23b99 100644 --- a/.github/workflows/build_packages.yaml +++ b/.github/workflows/build_packages.yaml @@ -355,8 +355,9 @@ jobs: id: meta with: images: ${{ matrix.registry }}/${{ github.repository_owner }}/${{ matrix.profile }} + ## only stable tag is latest flavor: | - latest=${{ !github.event.release.prerelease }} + latest=${{ contains(github.ref, 'tags') && !contains(github.ref_name, 'rc') && !contains(github.ref_name, 'beta') && !contains(github.ref_name, 'alpha') }} tags: | type=ref,event=branch type=ref,event=pr @@ -366,7 +367,8 @@ jobs: - uses: docker/build-push-action@v2 if: matrix.profile != 'emqx-ee' with: - push: ${{ github.event_name == 'release' && !github.event.release.prerelease }} + ## only push when stable tag and rc tag + push: ${{ contains(github.ref, 'tags') && !contains(github.ref_name, 'beta') && !contains(github.ref_name, 'alpha') }} pull: true no-cache: true platforms: linux/amd64,linux/arm64 @@ -381,7 +383,8 @@ jobs: - uses: docker/build-push-action@v2 if: matrix.profile == 'emqx-ee' with: - push: ${{ github.event_name == 'release' && !github.event.release.prerelease }} + ## only push when stable tag and rc tag + push: ${{ contains(github.ref, 'tags') && !contains(github.ref_name, 'beta') && !contains(github.ref_name, 'alpha') }} pull: true no-cache: true platforms: linux/amd64,linux/arm64 From 3610f931cfe521b01527bca2e5d3ae8788d5a690 Mon Sep 17 00:00:00 2001 From: zhouzb Date: Sat, 2 Apr 2022 10:29:32 +0800 Subject: [PATCH 6/7] chore: bump release vsn --- include/emqx_release.hrl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/emqx_release.hrl b/include/emqx_release.hrl index ddf28d5a3..809cd2c20 100644 --- a/include/emqx_release.hrl +++ b/include/emqx_release.hrl @@ -29,7 +29,7 @@ -ifndef(EMQX_ENTERPRISE). --define(EMQX_RELEASE, {opensource, "4.3.13"}). +-define(EMQX_RELEASE, {opensource, "4.3.13-rc.5"}). -else. From 4a57c10f61219cd5abdfa7afefa9c960d2ec1e5d Mon Sep 17 00:00:00 2001 From: Shawn <506895667@qq.com> Date: Sat, 2 Apr 2022 11:41:00 +0800 Subject: [PATCH 7/7] chore: release 4.3.13 --- include/emqx_release.hrl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/emqx_release.hrl b/include/emqx_release.hrl index 809cd2c20..ddf28d5a3 100644 --- a/include/emqx_release.hrl +++ b/include/emqx_release.hrl @@ -29,7 +29,7 @@ -ifndef(EMQX_ENTERPRISE). --define(EMQX_RELEASE, {opensource, "4.3.13-rc.5"}). +-define(EMQX_RELEASE, {opensource, "4.3.13"}). -else.