From 18246442aa508359e076213ea166bdf2d60b6b11 Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Mon, 26 Dec 2022 21:43:46 +0100 Subject: [PATCH 1/8] chore: prepare v5.0.13-rc.1 bump dashboard version to v1.1.4 --- Makefile | 2 +- apps/emqx/include/emqx_release.hrl | 2 +- deploy/charts/emqx/Chart.yaml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 201ff9da7..c2b33786b 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ export EMQX_DEFAULT_BUILDER = ghcr.io/emqx/emqx-builder/5.0-26:1.13.4-24.3.4.2-1 export EMQX_DEFAULT_RUNNER = debian:11-slim export OTP_VSN ?= $(shell $(CURDIR)/scripts/get-otp-vsn.sh) export ELIXIR_VSN ?= $(shell $(CURDIR)/scripts/get-elixir-vsn.sh) -export EMQX_DASHBOARD_VERSION ?= v1.1.4-beta.1 +export EMQX_DASHBOARD_VERSION ?= v1.1.4 export EMQX_EE_DASHBOARD_VERSION ?= e1.0.1-beta.9 export EMQX_REL_FORM ?= tgz export QUICER_DOWNLOAD_FROM_RELEASE = 1 diff --git a/apps/emqx/include/emqx_release.hrl b/apps/emqx/include/emqx_release.hrl index 9f03ee307..2276cac17 100644 --- a/apps/emqx/include/emqx_release.hrl +++ b/apps/emqx/include/emqx_release.hrl @@ -32,7 +32,7 @@ %% `apps/emqx/src/bpapi/README.md' %% Community edition --define(EMQX_RELEASE_CE, "5.0.12"). +-define(EMQX_RELEASE_CE, "5.0.13-rc.1"). %% Enterprise edition -define(EMQX_RELEASE_EE, "5.0.0-beta.6"). diff --git a/deploy/charts/emqx/Chart.yaml b/deploy/charts/emqx/Chart.yaml index 8bf0ee0e3..2be2a6324 100644 --- a/deploy/charts/emqx/Chart.yaml +++ b/deploy/charts/emqx/Chart.yaml @@ -14,8 +14,8 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 5.0.12 +version: 5.0.13 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. -appVersion: 5.0.12 +appVersion: 5.0.13 From ab474323a49db5c1e888a5de3183c7442deb0906 Mon Sep 17 00:00:00 2001 From: Ivan Dyachkov Date: Tue, 27 Dec 2022 09:08:57 +0100 Subject: [PATCH 2/8] build(macos): do not automatically lock keychain --- scripts/macos-sign-binaries.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/macos-sign-binaries.sh b/scripts/macos-sign-binaries.sh index 5f933349e..e91a97600 100755 --- a/scripts/macos-sign-binaries.sh +++ b/scripts/macos-sign-binaries.sh @@ -32,7 +32,7 @@ function cleanup { } security create-keychain -p "${KEYCHAIN_PASSWORD}" "${KEYCHAIN}" -security set-keychain-settings -lut 21600 "${KEYCHAIN}" +security set-keychain-settings "${KEYCHAIN}" security unlock-keychain -p "${KEYCHAIN_PASSWORD}" "${KEYCHAIN}" security import "${PKSC12_FILE}" -P "${APPLE_DEVELOPER_ID_BUNDLE_PASSWORD}" -t cert -f pkcs12 -k "${KEYCHAIN}" -T /usr/bin/codesign security set-key-partition-list -S "apple-tool:,apple:,codesign:" -s -k "${KEYCHAIN_PASSWORD}" "${KEYCHAIN}" From 7ec7ab785d909df53c181a0c61d489b0a0ca96fa Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Tue, 27 Dec 2022 09:14:25 +0100 Subject: [PATCH 3/8] ci: fix builder for elixir --- .github/workflows/build_packages.yaml | 35 ++++++++------------------- 1 file changed, 10 insertions(+), 25 deletions(-) diff --git a/.github/workflows/build_packages.yaml b/.github/workflows/build_packages.yaml index d54b3709c..12f38fb5f 100644 --- a/.github/workflows/build_packages.yaml +++ b/.github/workflows/build_packages.yaml @@ -180,21 +180,8 @@ jobs: matrix: profile: - ${{ needs.prepare.outputs.BUILD_PROFILE }} - builder: - - 5.0-26 otp: - 24.3.4.2-1 - elixir: - - 1.13.4 - # used to split elixir packages into a separate job, since the - # entire job may take a lot of time, especially on arm64 - # emulation. - # we only want to build ubuntu and centos with elixir for the - # time being, so it's easier to just include those with - # `with_elixir` set. - build_elixir: - # - with_elixir - - no_elixir arch: - amd64 - arm64 @@ -216,19 +203,17 @@ jobs: build_machine: aws-arm64 include: - profile: emqx - otp: 24.3.4.2-1 - elixir: 1.13.4 - build_elixir: with_elixir + otp: 25.1.2-2 arch: amd64 os: ubuntu20.04 build_machine: ubuntu-20.04 + is_elixir: yes - profile: emqx - otp: 24.3.4.2-1 - elixir: 1.13.4 - build_elixir: with_elixir + otp: 25.1.2-2 arch: amd64 os: amzn2 build_machine: ubuntu-20.04 + is_elixir: yes defaults: run: @@ -246,9 +231,9 @@ jobs: - name: build emqx packages working-directory: source env: - BUILDER: ${{ matrix.builder }} + BUILDER: '5.0-26' + ELIXIR: '1.13.4' OTP: ${{ matrix.otp }} - ELIXIR: ${{ matrix.elixir }} PROFILE: ${{ matrix.profile }} ARCH: ${{ matrix.arch }} SYSTEM: ${{ matrix.os }} @@ -262,11 +247,11 @@ jobs: fi echo "pwd is $PWD" PkgTypes="tgz pkg" - IsElixir="no" - if [ ${{ matrix.build_elixir }} = "with_elixir" ]; then + IS_ELIXIR="no" + if [ ${{ matrix.is_elixir }} == 'yes' ]; then PkgTypes="tgz" # set Elixir build flag - IsElixir="yes" + IS_ELIXIR="yes" fi for PKGTYPE in ${PkgTypes}; do @@ -274,7 +259,7 @@ jobs: --profile "${PROFILE}" \ --pkgtype "${PKGTYPE}" \ --arch "${ARCH}" \ - --elixir "${IsElixir}" \ + --elixir "${IS_ELIXIR}" \ --builder "ghcr.io/emqx/emqx-builder/${BUILDER}:${ELIXIR}-${OTP}-${SYSTEM}" done - uses: actions/upload-artifact@v3 From 0517541f3496915f6a524368fa3b74e7106e865e Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Tue, 27 Dec 2022 09:54:34 +0100 Subject: [PATCH 4/8] ci: bump to v5.0.13-rc.2 --- apps/emqx/include/emqx_release.hrl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/emqx/include/emqx_release.hrl b/apps/emqx/include/emqx_release.hrl index 2276cac17..254ea0000 100644 --- a/apps/emqx/include/emqx_release.hrl +++ b/apps/emqx/include/emqx_release.hrl @@ -32,7 +32,7 @@ %% `apps/emqx/src/bpapi/README.md' %% Community edition --define(EMQX_RELEASE_CE, "5.0.13-rc.1"). +-define(EMQX_RELEASE_CE, "5.0.13-rc.2"). %% Enterprise edition -define(EMQX_RELEASE_EE, "5.0.0-beta.6"). From db28de649e44db1f1d6e5475dda8446ab4faf38d Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Tue, 27 Dec 2022 10:51:08 +0100 Subject: [PATCH 5/8] ci: fix build matrix --- .github/workflows/build_packages.yaml | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build_packages.yaml b/.github/workflows/build_packages.yaml index 12f38fb5f..31e5b7e28 100644 --- a/.github/workflows/build_packages.yaml +++ b/.github/workflows/build_packages.yaml @@ -196,6 +196,10 @@ jobs: build_machine: - aws-arm64 - ubuntu-20.04 + builder: + - 5.0-26 + elixir: + - 1.13.4 exclude: - arch: arm64 build_machine: ubuntu-20.04 @@ -207,13 +211,17 @@ jobs: arch: amd64 os: ubuntu20.04 build_machine: ubuntu-20.04 - is_elixir: yes + builder: 5.0-26 + elixir: 1.13.4 + release_with: elixir - profile: emqx otp: 25.1.2-2 arch: amd64 os: amzn2 build_machine: ubuntu-20.04 - is_elixir: yes + builder: 5.0-26 + elixir: 1.13.4 + release_with: elixir defaults: run: @@ -231,8 +239,8 @@ jobs: - name: build emqx packages working-directory: source env: - BUILDER: '5.0-26' - ELIXIR: '1.13.4' + BUILDER: ${{ matrix.builder }} + ELIXIR: ${{ matrix.elixir }} OTP: ${{ matrix.otp }} PROFILE: ${{ matrix.profile }} ARCH: ${{ matrix.arch }} @@ -246,14 +254,14 @@ jobs: cd /emqx fi echo "pwd is $PWD" - PkgTypes="tgz pkg" + PKGTYPES="tgz pkg" IS_ELIXIR="no" - if [ ${{ matrix.is_elixir }} == 'yes' ]; then - PkgTypes="tgz" + if [ ${{ matrix.release_with }} == 'elixir' ]; then + PKGTYPES="tgz" # set Elixir build flag IS_ELIXIR="yes" fi - for PKGTYPE in ${PkgTypes}; + for PKGTYPE in ${PKGTYPES}; do ./scripts/buildx.sh \ --profile "${PROFILE}" \ From 25e6ccc82fcb97a5d46be67625d7eac45036480b Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Tue, 27 Dec 2022 11:24:10 +0100 Subject: [PATCH 6/8] ci: build elixir package on OTP 24 for Amazon Linux 2 for now --- .github/workflows/build_packages.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_packages.yaml b/.github/workflows/build_packages.yaml index 31e5b7e28..7fce82cf8 100644 --- a/.github/workflows/build_packages.yaml +++ b/.github/workflows/build_packages.yaml @@ -215,7 +215,7 @@ jobs: elixir: 1.13.4 release_with: elixir - profile: emqx - otp: 25.1.2-2 + otp: 24.3.4.2-1 # TODO: 25.1.2-2 arch: amd64 os: amzn2 build_machine: ubuntu-20.04 From 15bd797b36f1762d2c75195e10be0ada758667b2 Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Tue, 27 Dec 2022 11:24:47 +0100 Subject: [PATCH 7/8] ci: bump to v5.0.13-rc.3 --- apps/emqx/include/emqx_release.hrl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/emqx/include/emqx_release.hrl b/apps/emqx/include/emqx_release.hrl index 254ea0000..4cb95441e 100644 --- a/apps/emqx/include/emqx_release.hrl +++ b/apps/emqx/include/emqx_release.hrl @@ -32,7 +32,7 @@ %% `apps/emqx/src/bpapi/README.md' %% Community edition --define(EMQX_RELEASE_CE, "5.0.13-rc.2"). +-define(EMQX_RELEASE_CE, "5.0.13-rc.3"). %% Enterprise edition -define(EMQX_RELEASE_EE, "5.0.0-beta.6"). From a777bac38c699f07f5fb14c8b99b95ba42f08b78 Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Tue, 27 Dec 2022 11:54:09 +0100 Subject: [PATCH 8/8] build: prepare for v5.0.13 release --- apps/emqx/include/emqx_release.hrl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/emqx/include/emqx_release.hrl b/apps/emqx/include/emqx_release.hrl index 4cb95441e..cea7f076c 100644 --- a/apps/emqx/include/emqx_release.hrl +++ b/apps/emqx/include/emqx_release.hrl @@ -32,7 +32,7 @@ %% `apps/emqx/src/bpapi/README.md' %% Community edition --define(EMQX_RELEASE_CE, "5.0.13-rc.3"). +-define(EMQX_RELEASE_CE, "5.0.13"). %% Enterprise edition -define(EMQX_RELEASE_EE, "5.0.0-beta.6").