diff --git a/.github/workflows/build_packages.yaml b/.github/workflows/build_packages.yaml index de2f18a58..ec9c53265 100644 --- a/.github/workflows/build_packages.yaml +++ b/.github/workflows/build_packages.yaml @@ -14,7 +14,7 @@ jobs: matrix: otp: - "23.2.7.2-emqx-2" - - "24.0.5-emqx-1" + - "24.1.1-emqx-1" runs-on: ubuntu-20.04 container: "ghcr.io/emqx/emqx-builder-helper/5.0:${{ matrix.otp }}-ubuntu20.04" @@ -83,7 +83,7 @@ jobs: steps: - uses: actions/download-artifact@v2 with: - name: source-23.2.7.2-emqx-2 + name: source-24.1.1-emqx-1 path: . - name: unzip source code run: Expand-Archive -Path source-23.2.7.2-emqx-2.zip -DestinationPath ./ @@ -92,7 +92,7 @@ jobs: id: install_erlang ## gleam-lang/setup-erlang does not yet support the installation of otp24 on windows with: - otp-version: 23.2 + otp-version: 24.1 - name: build env: PYTHON: python @@ -151,7 +151,7 @@ jobs: - macos-11 - macos-10.15 otp: - - 24.0.5-emqx-1 + - 24.1.1-emqx-1 exclude: - profile: emqx-edge @@ -244,7 +244,7 @@ jobs: - arm64 otp: - 23.2.7.2-emqx-2 - - 24.0.5-emqx-1 + - 24.1.1-emqx-1 exclude: - os: centos6 arch: arm64 @@ -347,7 +347,7 @@ jobs: matrix: profile: ${{fromJSON(needs.prepare.outputs.profiles)}} otp: - - 24.0.5-emqx-1 + - 24.1.1-emqx-1 steps: - uses: actions/download-artifact@v2 @@ -400,7 +400,7 @@ jobs: matrix: otp: - 23.2.7.2-emqx-2 - - 24.0.5-emqx-1 + - 24.1.1-emqx-1 needs: [prepare, mac, linux, docker] steps: - uses: geekyeggo/delete-artifact@v1 @@ -418,7 +418,7 @@ jobs: matrix: profile: ${{fromJSON(needs.prepare.outputs.profiles)}} otp: - - 24.0.5-emqx-1 + - 24.1.1-emqx-1 steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/build_slim_packages.yaml b/.github/workflows/build_slim_packages.yaml index 293bcb82b..2e16cc13b 100644 --- a/.github/workflows/build_slim_packages.yaml +++ b/.github/workflows/build_slim_packages.yaml @@ -16,7 +16,7 @@ jobs: fail-fast: false matrix: otp: - - 24.0.5-emqx-1 + - 24.1.1-emqx-1 os: - ubuntu20.04 - centos7 @@ -62,7 +62,7 @@ jobs: - macos-11 - macos-10.15 otp: - - 24.0.5-emqx-1 + - 24.1.1-emqx-1 runs-on: ${{ matrix.macos }} diff --git a/.github/workflows/check_deps_integrity.yaml b/.github/workflows/check_deps_integrity.yaml index c316b582d..dc7b1ad69 100644 --- a/.github/workflows/check_deps_integrity.yaml +++ b/.github/workflows/check_deps_integrity.yaml @@ -5,7 +5,7 @@ on: [pull_request] jobs: check_deps_integrity: runs-on: ubuntu-20.04 - container: "ghcr.io/emqx/emqx-builder-helper/5.0:24.0.5-emqx-1-ubuntu20.04" + container: "ghcr.io/emqx/emqx-builder-helper/5.0:24.1.1-emqx-1-ubuntu20.04" steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/run_emqx_app_tests.yaml b/.github/workflows/run_emqx_app_tests.yaml index 2ce1edd8c..72b3dd172 100644 --- a/.github/workflows/run_emqx_app_tests.yaml +++ b/.github/workflows/run_emqx_app_tests.yaml @@ -13,7 +13,7 @@ jobs: matrix: otp: - "23.2.7.2-emqx-2" - - "24.0.5-emqx-1" + - "24.1.1-emqx-1" runs-on: ubuntu-20.04 container: "ghcr.io/emqx/emqx-builder-helper/5.0:${{ matrix.otp }}-ubuntu20.04" diff --git a/.github/workflows/run_fvt_tests.yaml b/.github/workflows/run_fvt_tests.yaml index 8eade9127..d5099daeb 100644 --- a/.github/workflows/run_fvt_tests.yaml +++ b/.github/workflows/run_fvt_tests.yaml @@ -13,7 +13,7 @@ jobs: matrix: otp: - "23.2.7.2-emqx-2" - - "24.0.5-emqx-1" + - "24.1.1-emqx-1" runs-on: ubuntu-20.04 container: "ghcr.io/emqx/emqx-builder-helper/5.0:${{ matrix.otp }}-ubuntu20.04" diff --git a/.github/workflows/run_relup_tests.yaml b/.github/workflows/run_relup_tests.yaml index ca7b93064..3001ea3a0 100644 --- a/.github/workflows/run_relup_tests.yaml +++ b/.github/workflows/run_relup_tests.yaml @@ -13,7 +13,7 @@ jobs: matrix: otp: - "23.2.7.2-emqx-2" - - "24.0.5-emqx-1" + - "24.1.1-emqx-1" runs-on: ubuntu-20.04 container: "ghcr.io/emqx/emqx-builder-helper/5.0:${{ matrix.otp }}-ubuntu20.04" diff --git a/.github/workflows/run_test_cases.yaml b/.github/workflows/run_test_cases.yaml index 5f631debb..b66b86ea0 100644 --- a/.github/workflows/run_test_cases.yaml +++ b/.github/workflows/run_test_cases.yaml @@ -13,7 +13,7 @@ jobs: matrix: otp: - "23.2.7.2-emqx-2" - - "24.0.5-emqx-1" + - "24.1.1-emqx-1" runs-on: ubuntu-20.04 container: "ghcr.io/emqx/emqx-builder-helper/5.0:${{ matrix.otp }}-ubuntu20.04" @@ -36,7 +36,7 @@ jobs: matrix: otp: - "23.2.7.2-emqx-2" - - "24.0.5-emqx-1" + - "24.1.1-emqx-1" runs-on: ubuntu-20.04 container: "ghcr.io/emqx/emqx-builder-helper/5.0:${{ matrix.otp }}-ubuntu20.04" diff --git a/deploy/docker/Dockerfile b/deploy/docker/Dockerfile index 0c9aee451..92b4c944d 100644 --- a/deploy/docker/Dockerfile +++ b/deploy/docker/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=ghcr.io/emqx/emqx-builder-helper/5.0:24.0.5-emqx-1-alpine3.14 +ARG BUILD_FROM=ghcr.io/emqx/emqx-builder-helper/5.0:24.1.1-emqx-1-alpine3.14 ARG RUN_FROM=alpine:3.14 FROM ${BUILD_FROM} AS builder