From 25b4737890d4b7c1bc5d83bb35ca82128f99b4bb Mon Sep 17 00:00:00 2001 From: Shawn <506895667@qq.com> Date: Fri, 30 Jun 2023 13:52:52 +0800 Subject: [PATCH 1/3] fix: bump app vsns --- apps/emqx_rule_engine/src/emqx_rule_engine.app.src | 2 +- apps/emqx_rule_engine/src/emqx_rule_engine.appup.src | 6 ++++-- lib-ce/emqx_dashboard/src/emqx_dashboard.app.src | 2 +- src/emqx.app.src | 2 +- src/emqx.appup.src | 10 ++++++++-- 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/apps/emqx_rule_engine/src/emqx_rule_engine.app.src b/apps/emqx_rule_engine/src/emqx_rule_engine.app.src index e679244b2..fed58a48d 100644 --- a/apps/emqx_rule_engine/src/emqx_rule_engine.app.src +++ b/apps/emqx_rule_engine/src/emqx_rule_engine.app.src @@ -1,6 +1,6 @@ {application, emqx_rule_engine, [{description, "EMQX Rule Engine"}, - {vsn, "4.4.19"}, % strict semver, bump manually! + {vsn, "4.4.20"}, % strict semver, bump manually! {modules, []}, {registered, [emqx_rule_engine_sup, emqx_rule_registry, emqx_rule_engine_jwt_sup]}, {applications, [kernel,stdlib,rulesql,getopt,jose,uuid]}, diff --git a/apps/emqx_rule_engine/src/emqx_rule_engine.appup.src b/apps/emqx_rule_engine/src/emqx_rule_engine.appup.src index 6cd923618..f53e60995 100644 --- a/apps/emqx_rule_engine/src/emqx_rule_engine.appup.src +++ b/apps/emqx_rule_engine/src/emqx_rule_engine.appup.src @@ -1,7 +1,8 @@ %% -*- mode: erlang -*- %% Unless you know what you are doing, DO NOT edit manually!! {VSN, - [{"4.4.18", + [{"4.4.19",[{load_module,emqx_rule_runtime,brutal_purge,soft_purge,[]}]}, + {"4.4.18", [{load_module,emqx_rule_validator,brutal_purge,soft_purge,[]}, {load_module,emqx_rule_utils,brutal_purge,soft_purge,[]}, {load_module,emqx_rule_sqltester,brutal_purge,soft_purge,[]}, @@ -357,7 +358,8 @@ {load_module,emqx_rule_engine,brutal_purge,soft_purge,[]}, {load_module,emqx_rule_runtime,brutal_purge,soft_purge,[]}]}, {<<".*">>,[]}], - [{"4.4.18", + [{"4.4.19",[{load_module,emqx_rule_runtime,brutal_purge,soft_purge,[]}]}, + {"4.4.18", [{load_module,emqx_rule_validator,brutal_purge,soft_purge,[]}, {load_module,emqx_rule_utils,brutal_purge,soft_purge,[]}, {load_module,emqx_rule_sqltester,brutal_purge,soft_purge,[]}, diff --git a/lib-ce/emqx_dashboard/src/emqx_dashboard.app.src b/lib-ce/emqx_dashboard/src/emqx_dashboard.app.src index a224d70ef..5be336271 100644 --- a/lib-ce/emqx_dashboard/src/emqx_dashboard.app.src +++ b/lib-ce/emqx_dashboard/src/emqx_dashboard.app.src @@ -1,6 +1,6 @@ {application, emqx_dashboard, [{description, "EMQX Web Dashboard"}, - {vsn, "4.4.18"}, % strict semver, bump manually! + {vsn, "4.4.19"}, % strict semver, bump manually! {modules, []}, {registered, [emqx_dashboard_sup]}, {applications, [kernel,stdlib,mnesia,minirest]}, diff --git a/src/emqx.app.src b/src/emqx.app.src index 3ccbab2a7..88cce2618 100644 --- a/src/emqx.app.src +++ b/src/emqx.app.src @@ -6,7 +6,7 @@ %% the emqx `release' version, which in turn is comprised of several %% apps, one of which is this. See `emqx_release.hrl' for more %% info. - {vsn, "4.4.19"}, % strict semver, bump manually! + {vsn, "4.4.20"}, % strict semver, bump manually! {modules, []}, {registered, []}, {applications, [ kernel diff --git a/src/emqx.appup.src b/src/emqx.appup.src index effdab40f..8414999d7 100644 --- a/src/emqx.appup.src +++ b/src/emqx.appup.src @@ -1,7 +1,10 @@ %% -*- mode: erlang -*- %% Unless you know what you are doing, DO NOT edit manually!! {VSN, - [{"4.4.18", + [{"4.4.19", + [{load_module,emqx_relup,brutal_purge,soft_purge,[]}, + {load_module,emqx_app,brutal_purge,soft_purge,[]}]}, + {"4.4.18", [{load_module,emqx_plugins,brutal_purge,soft_purge,[]}, {load_module,emqx_hooks,brutal_purge,soft_purge,[]}, {load_module,emqx_zone,brutal_purge,soft_purge,[]}, @@ -646,7 +649,10 @@ {apply,{application,set_env, [gen_rpc,insecure_auth_fallback_allowed,true]}}]}, {<<".*">>,[]}], - [{"4.4.18", + [{"4.4.19", + [{load_module,emqx_relup,brutal_purge,soft_purge,[]}, + {load_module,emqx_app,brutal_purge,soft_purge,[]}]}, + {"4.4.18", [{load_module,emqx_plugins,brutal_purge,soft_purge,[]}, {load_module,emqx_hooks,brutal_purge,soft_purge,[]}, {load_module,emqx_zone,brutal_purge,soft_purge,[]}, From ab26831e7ebd119b503bcbb9647df4f3ec13b950 Mon Sep 17 00:00:00 2001 From: Shawn <506895667@qq.com> Date: Fri, 30 Jun 2023 14:58:52 +0800 Subject: [PATCH 2/3] fix: download jmeter failed with 404 --- .github/workflows/run_automate_tests.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/run_automate_tests.yaml b/.github/workflows/run_automate_tests.yaml index fd138b06f..2dac4d7e9 100644 --- a/.github/workflows/run_automate_tests.yaml +++ b/.github/workflows/run_automate_tests.yaml @@ -20,7 +20,7 @@ jobs: id: dload_jmeter timeout-minutes: 1 env: - JMETER_VERSION: 5.4.3 + JMETER_VERSION: 5.6 run: | wget --no-verbose --no-check-certificate -O /tmp/apache-jmeter.tgz https://downloads.apache.org/jmeter/binaries/apache-jmeter-$JMETER_VERSION.tgz - uses: actions/upload-artifact@v3 @@ -124,7 +124,7 @@ jobs: - name: install jmeter timeout-minutes: 10 env: - JMETER_VERSION: 5.4.3 + JMETER_VERSION: 5.6 run: | cd /tmp && tar -xvf apache-jmeter.tgz echo "jmeter.save.saveservice.output_format=xml" >> /tmp/apache-jmeter-$JMETER_VERSION/user.properties @@ -222,7 +222,7 @@ jobs: - name: install jmeter timeout-minutes: 10 env: - JMETER_VERSION: 5.4.3 + JMETER_VERSION: 5.6 run: | cd /tmp && tar -xvf apache-jmeter.tgz echo "jmeter.save.saveservice.output_format=xml" >> /tmp/apache-jmeter-$JMETER_VERSION/user.properties @@ -331,7 +331,7 @@ jobs: - name: install jmeter timeout-minutes: 10 env: - JMETER_VERSION: 5.4.3 + JMETER_VERSION: 5.6 run: | cd /tmp && tar -xvf apache-jmeter.tgz echo "jmeter.save.saveservice.output_format=xml" >> /tmp/apache-jmeter-$JMETER_VERSION/user.properties @@ -434,7 +434,7 @@ jobs: - name: install jmeter timeout-minutes: 10 env: - JMETER_VERSION: 5.4.3 + JMETER_VERSION: 5.6 run: | cd /tmp && tar -xvf apache-jmeter.tgz echo "jmeter.save.saveservice.output_format=xml" >> /tmp/apache-jmeter-$JMETER_VERSION/user.properties From 504b20d4bc39caef41e4fcd6d4c463d131e437f4 Mon Sep 17 00:00:00 2001 From: Shawn <506895667@qq.com> Date: Fri, 30 Jun 2023 15:38:27 +0800 Subject: [PATCH 3/3] fix: download maven-3.6.3 404 --- .ci/docker-compose-file/http-service/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.ci/docker-compose-file/http-service/Dockerfile b/.ci/docker-compose-file/http-service/Dockerfile index 6601841ef..4bc1b1ef0 100644 --- a/.ci/docker-compose-file/http-service/Dockerfile +++ b/.ci/docker-compose-file/http-service/Dockerfile @@ -1,9 +1,9 @@ FROM tomcat:10.0.5 -RUN wget https://downloads.apache.org/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.zip \ - && unzip -q apache-maven-3.6.3-bin.zip \ - && mv apache-maven-3.6.3 /opt/apache-maven-3.6.3/ \ - && ln -s /opt/apache-maven-3.6.3/ /opt/maven +RUN wget https://downloads.apache.org/maven/maven-3/3.9.3/binaries/apache-maven-3.9.3-bin.zip \ + && unzip -q apache-maven-3.9.3-bin.zip \ + && mv apache-maven-3.9.3 /opt/apache-maven-3.9.3/ \ + && ln -s /opt/apache-maven-3.9.3/ /opt/maven ENV M2_HOME=/opt/maven ENV M2=$M2_HOME/bin ENV PATH=$M2:$PATH