Merge pull request #9621 from emqx/release-50

merge release-50 back to master

.github/workflows/build_packages.yaml

@@ -198,21 +198,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
@@ -227,6 +214,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
@@ -234,19 +225,21 @@ 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
-          - profile: emqx
-            otp: 24.3.4.2-1
+            builder: 5.0-26
             elixir: 1.13.4
-            build_elixir: with_elixir
+            release_with: elixir
+          - profile: emqx
+            otp: 24.3.4.2-1 # TODO: 25.1.2-2
             arch: amd64
             os: amzn2
             build_machine: ubuntu-20.04
+            builder: 5.0-26
+            elixir: 1.13.4
+            release_with: elixir
 
     defaults:
       run:
@@ -265,8 +258,8 @@ jobs:
       working-directory: source
       env:
         BUILDER: ${{ matrix.builder }}
-        OTP: ${{ matrix.otp }}
         ELIXIR: ${{ matrix.elixir }}
+        OTP: ${{ matrix.otp }}
         PROFILE: ${{ matrix.profile }}
         ARCH: ${{ matrix.arch }}
         SYSTEM: ${{ matrix.os }}
@@ -279,20 +272,20 @@ jobs:
           cd /emqx
         fi
         echo "pwd is $PWD"
-        PkgTypes="tgz pkg"
-        IsElixir="no"
-        if [ ${{ matrix.build_elixir }} = "with_elixir" ]; then
-          PkgTypes="tgz"
+        PKGTYPES="tgz pkg"
+        IS_ELIXIR="no"
+        if [ ${{ matrix.release_with }} == 'elixir' ]; then
+          PKGTYPES="tgz"
           # set Elixir build flag
-          IsElixir="yes"
+          IS_ELIXIR="yes"
         fi
-        for PKGTYPE in ${PkgTypes};
+        for PKGTYPE in ${PKGTYPES};
         do
           ./scripts/buildx.sh \
             --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

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

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").
 
 %% Enterprise edition
 -define(EMQX_RELEASE_EE, "5.0.0-beta.6").

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

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}"