Skip to content

Commit

Permalink
fix: bump emqx version to 5.1.3 (#202)
Browse files Browse the repository at this point in the history
  • Loading branch information
robcmann authored Nov 18, 2024
1 parent 64bce8b commit 1dc542c
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ jobs:
path: |
emqx
# TODO use commit as cache key
key: cache-emqx-5.1.2-${{ matrix.os }}
key: cache-emqx-5.1.3-${{ matrix.os }}
- name: Build EMQX
if: steps.cache-emqx-restore.outputs.cache-hit != 'true'
run: |
Expand All @@ -106,7 +106,7 @@ jobs:
python3 -u -m bin --port-driver-only
python3 -u -m bin --quick
- name: Upload artifact
uses: actions/upload-artifact@v1.0.0
uses: actions/upload-artifact@v3
with:
name: Build artifact ${{matrix.os}}
path: build/emqx.zip
2 changes: 1 addition & 1 deletion THIRD-PARTY-LICENSES
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
** aws-iot-device-sdk-cpp-v2; version 1.18.2 -- https://github.com/aws/aws-iot-device-sdk-cpp-v2/
** EMQX; version 5.1.2 -- https://emqx.io/
** EMQX; version 5.1.3 -- https://emqx.io/
** Erlang OTP; version 24.0 -- https://www.erlang.org/

Apache License
Expand Down
2 changes: 1 addition & 1 deletion emqx.commit
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7df0c6a808ee9a546fd0bfddbdc1a5b5512fdd1b
10a845544323421c41a4a453961cf4dbb4765daa
8 changes: 4 additions & 4 deletions gg/rebar.config
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
%% SPDX-License-Identifier: Apache-2.0

{deps, [
{emqx, {git_subdir, "https://github.com/emqx/emqx.git", {tag, "v5.1.2"}, "apps/emqx"}},
{emqx_ctl, {git_subdir, "https://github.com/emqx/emqx.git", {tag, "v5.1.2"}, "apps/emqx_ctl"}},
{emqx_utils, {git_subdir, "https://github.com/emqx/emqx.git", {tag, "v5.1.2"}, "apps/emqx_utils"}},
{emqx_durable_storage, {git_subdir, "https://github.com/emqx/emqx.git", {tag, "v5.1.2"}, "apps/emqx_durable_storage"}}
{emqx, {git_subdir, "https://github.com/emqx/emqx.git", {tag, "v5.1.3"}, "apps/emqx"}},
{emqx_ctl, {git_subdir, "https://github.com/emqx/emqx.git", {tag, "v5.1.3"}, "apps/emqx_ctl"}},
{emqx_utils, {git_subdir, "https://github.com/emqx/emqx.git", {tag, "v5.1.3"}, "apps/emqx_utils"}},
{emqx_durable_storage, {git_subdir, "https://github.com/emqx/emqx.git", {tag, "v5.1.3"}, "apps/emqx_durable_storage"}}
]}.

{relx, [
Expand Down
2 changes: 1 addition & 1 deletion gg/src/gg_conf.erl
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ get_override_conf(Conf) ->

%% We don't set cacertfile in ssl options. In order for this to take
%% in emqx_conf_cli:load_config, we must remove it from the configuration map.
%% Setting cacertfile to null, undefined, or empty string does not work (as of EMQX 5.1.2)
%% Setting cacertfile to null, undefined, or empty string does not work (as of EMQX 5.1.1)
no_cacertfile_workaround(#{<<"listeners">> := Val} = Conf) ->
Conf#{<<"listeners">> => no_cacertfile_workaround(Val)};
no_cacertfile_workaround(#{<<"ssl">> := Val} = Conf) ->
Expand Down

0 comments on commit 1dc542c

Please sign in to comment.