From 6aca61d121489cc3a2de22183cc3a466316f6160 Mon Sep 17 00:00:00 2001 From: ieQu1 <99872536+ieQu1@users.noreply.github.com> Date: Tue, 11 Jul 2023 10:45:58 +0200 Subject: [PATCH] chore: Fix CI --- .github/workflows/build_packages.yaml | 2 +- .github/workflows/build_slim_packages.yaml | 2 +- .github/workflows/run_fvt_tests.yaml | 4 ++-- .github/workflows/run_jmeter_tests.yaml | 12 ++++++------ .github/workflows/run_relup_tests.yaml | 2 +- apps/emqx/src/emqx.app.src | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build_packages.yaml b/.github/workflows/build_packages.yaml index 3141b77d5..fae593bd1 100644 --- a/.github/workflows/build_packages.yaml +++ b/.github/workflows/build_packages.yaml @@ -104,7 +104,7 @@ jobs: - name: unzip source code run: Expand-Archive -Path source.zip -DestinationPath ./ - uses: ilammy/msvc-dev-cmd@v1.12.0 - - uses: erlef/setup-beam@v1.15.2 + - uses: erlef/setup-beam@v1.16.0 with: otp-version: 24.3.4.6 - name: build diff --git a/.github/workflows/build_slim_packages.yaml b/.github/workflows/build_slim_packages.yaml index 163956790..4ac8d7ab5 100644 --- a/.github/workflows/build_slim_packages.yaml +++ b/.github/workflows/build_slim_packages.yaml @@ -96,7 +96,7 @@ jobs: steps: - uses: actions/checkout@v3 - uses: ilammy/msvc-dev-cmd@v1.12.0 - - uses: erlef/setup-beam@v1.15.2 + - uses: erlef/setup-beam@v1.16.0 with: otp-version: ${{ matrix.otp }} - name: build diff --git a/.github/workflows/run_fvt_tests.yaml b/.github/workflows/run_fvt_tests.yaml index f729c8cbd..05fe6601b 100644 --- a/.github/workflows/run_fvt_tests.yaml +++ b/.github/workflows/run_fvt_tests.yaml @@ -58,7 +58,7 @@ jobs: arch: - amd64 steps: - - uses: erlef/setup-beam@v1.15.2 + - uses: erlef/setup-beam@v1.16.0 with: otp-version: 24.3.4.6 - uses: actions/download-artifact@v3 @@ -133,7 +133,7 @@ jobs: # - emqx-enterprise # TODO test enterprise steps: - - uses: erlef/setup-beam@v1.15.2 + - uses: erlef/setup-beam@v1.16.0 with: otp-version: 24.3.4.6 - uses: actions/download-artifact@v3 diff --git a/.github/workflows/run_jmeter_tests.yaml b/.github/workflows/run_jmeter_tests.yaml index e402c7fed..54d296922 100644 --- a/.github/workflows/run_jmeter_tests.yaml +++ b/.github/workflows/run_jmeter_tests.yaml @@ -14,7 +14,7 @@ jobs: outputs: version: ${{ steps.build_docker.outputs.version}} steps: - - uses: erlef/setup-beam@v1.15.2 + - uses: erlef/setup-beam@v1.16.0 with: otp-version: 24.3.4.6 - name: download jmeter @@ -57,7 +57,7 @@ jobs: needs: build_emqx_for_jmeter_tests steps: - - uses: erlef/setup-beam@v1.15.2 + - uses: erlef/setup-beam@v1.16.0 with: otp-version: 24.3.4.6 - uses: actions/checkout@v3 @@ -153,7 +153,7 @@ jobs: needs: build_emqx_for_jmeter_tests steps: - - uses: erlef/setup-beam@v1.15.2 + - uses: erlef/setup-beam@v1.16.0 with: otp-version: 24.3.4.6 - uses: actions/checkout@v3 @@ -259,7 +259,7 @@ jobs: needs: build_emqx_for_jmeter_tests steps: - - uses: erlef/setup-beam@v1.15.2 + - uses: erlef/setup-beam@v1.16.0 with: otp-version: 24.3.4.6 - uses: actions/checkout@v3 @@ -361,7 +361,7 @@ jobs: needs: build_emqx_for_jmeter_tests steps: - - uses: erlef/setup-beam@v1.15.2 + - uses: erlef/setup-beam@v1.16.0 with: otp-version: 24.3.4.6 - uses: actions/checkout@v3 @@ -460,7 +460,7 @@ jobs: needs: build_emqx_for_jmeter_tests steps: - - uses: erlef/setup-beam@v1.15.2 + - uses: erlef/setup-beam@v1.16.0 with: otp-version: 24.3.4.6 - uses: actions/checkout@v3 diff --git a/.github/workflows/run_relup_tests.yaml b/.github/workflows/run_relup_tests.yaml index cd969045d..ed53dcf23 100644 --- a/.github/workflows/run_relup_tests.yaml +++ b/.github/workflows/run_relup_tests.yaml @@ -71,7 +71,7 @@ jobs: shell: bash steps: # setup Erlang to run lux - - uses: erlef/setup-beam@v1.15.2 + - uses: erlef/setup-beam@v1.16.0 with: otp-version: 24.3.4.6 - uses: actions/checkout@v3 diff --git a/apps/emqx/src/emqx.app.src b/apps/emqx/src/emqx.app.src index 1cecd7b61..7014c8381 100644 --- a/apps/emqx/src/emqx.app.src +++ b/apps/emqx/src/emqx.app.src @@ -3,7 +3,7 @@ {id, "emqx"}, {description, "EMQX Core"}, % strict semver, bump manually! - {vsn, "5.0.21"}, + {vsn, "5.0.22"}, {modules, []}, {registered, []}, {applications, [