Merge pull request #10141 from id/0315-chore-merge-release-50-to-master
0315 chore merge release 50 to master
This commit is contained in:
commit
c9b736ae23
|
@ -213,8 +213,6 @@ jobs:
|
|||
- ubuntu18.04
|
||||
- debian11
|
||||
- debian10
|
||||
- raspbian10
|
||||
- raspbian9
|
||||
- el9
|
||||
- el8
|
||||
- el7
|
||||
|
@ -231,10 +229,6 @@ jobs:
|
|||
build_machine: ubuntu-22.04
|
||||
- arch: amd64
|
||||
build_machine: aws-arm64
|
||||
- arch: amd64
|
||||
os: raspbian9
|
||||
- arch: amd64
|
||||
os: raspbian10
|
||||
include:
|
||||
- profile: emqx
|
||||
otp: 25.1.2-2
|
||||
|
@ -266,6 +260,11 @@ jobs:
|
|||
path: .
|
||||
- name: unzip source code
|
||||
run: unzip -q source.zip
|
||||
- name: tmp fix for el9
|
||||
if: matrix.os == 'el9'
|
||||
run: |
|
||||
set -eu
|
||||
dnf install -y krb5-devel
|
||||
- name: build emqx packages
|
||||
working-directory: source
|
||||
env:
|
||||
|
@ -378,8 +377,6 @@ jobs:
|
|||
push "debian/buster" "packages/$PROFILE/$PROFILE-$VERSION-debian10-arm64.deb"
|
||||
push "debian/bullseye" "packages/$PROFILE/$PROFILE-$VERSION-debian11-amd64.deb"
|
||||
push "debian/bullseye" "packages/$PROFILE/$PROFILE-$VERSION-debian11-arm64.deb"
|
||||
push "raspbian/stretch" "packages/$PROFILE/$PROFILE-$VERSION-raspbian9-arm64.deb"
|
||||
push "raspbian/buster" "packages/$PROFILE/$PROFILE-$VERSION-raspbian10-arm64.deb"
|
||||
push "ubuntu/bionic" "packages/$PROFILE/$PROFILE-$VERSION-ubuntu18.04-amd64.deb"
|
||||
push "ubuntu/bionic" "packages/$PROFILE/$PROFILE-$VERSION-ubuntu18.04-arm64.deb"
|
||||
push "ubuntu/focal" "packages/$PROFILE/$PROFILE-$VERSION-ubuntu20.04-amd64.deb"
|
||||
|
|
2
Makefile
2
Makefile
|
@ -6,7 +6,7 @@ export EMQX_DEFAULT_BUILDER = ghcr.io/emqx/emqx-builder/5.0-28:1.13.4-24.3.4.2-2
|
|||
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.8
|
||||
export EMQX_DASHBOARD_VERSION ?= v1.1.9
|
||||
export EMQX_EE_DASHBOARD_VERSION ?= e1.0.4
|
||||
export EMQX_REL_FORM ?= tgz
|
||||
export QUICER_DOWNLOAD_FROM_RELEASE = 1
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
-define(EMQX_RELEASE_CE, "5.0.20").
|
||||
|
||||
%% Enterprise edition
|
||||
-define(EMQX_RELEASE_EE, "5.0.1").
|
||||
-define(EMQX_RELEASE_EE, "5.0.2-alpha.1").
|
||||
|
||||
%% the HTTP API version
|
||||
-define(EMQX_API_VERSION, "5.0").
|
||||
|
|
|
@ -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.1
|
||||
version: 5.0.2
|
||||
|
||||
# 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.1
|
||||
appVersion: 5.0.2
|
||||
|
|
Loading…
Reference in New Issue