From caf1784a90e7229d59ff23481fcc4a28dc9b56b7 Mon Sep 17 00:00:00 2001 From: zhouzb Date: Thu, 2 Dec 2021 15:25:11 +0800 Subject: [PATCH] build: update otp version --- .ci/docker-compose-file/docker-compose.yaml | 4 ++-- .github/workflows/build_packages.yaml | 14 +++++++------- .github/workflows/build_slim_packages.yaml | 6 +++--- .github/workflows/check_deps_integrity.yaml | 2 +- .github/workflows/run_emqx_app_tests.yaml | 4 ++-- .github/workflows/run_fvt_tests.yaml | 6 +++--- .github/workflows/run_relup_tests.yaml | 4 ++-- .github/workflows/run_test_cases.yaml | 4 ++-- .tool-versions | 2 +- deploy/docker/Dockerfile | 2 +- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.ci/docker-compose-file/docker-compose.yaml b/.ci/docker-compose-file/docker-compose.yaml index 2f0137428..f1cce9364 100644 --- a/.ci/docker-compose-file/docker-compose.yaml +++ b/.ci/docker-compose-file/docker-compose.yaml @@ -3,7 +3,7 @@ version: '3.9' services: erlang23: container_name: erlang23 - image: ghcr.io/emqx/emqx-builder/5.0-2:23.3.4.9-3-ubuntu20.04 + image: ghcr.io/emqx/emqx-builder/5.0-3:23.3.4.9-3-ubuntu20.04 env_file: - conf.env environment: @@ -23,7 +23,7 @@ services: erlang24: container_name: erlang24 - image: ghcr.io/emqx/emqx-builder/5.0-2:24.1.5-2-ubuntu20.04 + image: ghcr.io/emqx/emqx-builder/5.0-3:24.1.5-3-ubuntu20.04 env_file: - conf.env environment: diff --git a/.github/workflows/build_packages.yaml b/.github/workflows/build_packages.yaml index bf972f920..77376f02c 100644 --- a/.github/workflows/build_packages.yaml +++ b/.github/workflows/build_packages.yaml @@ -19,7 +19,7 @@ jobs: prepare: runs-on: ubuntu-20.04 # prepare source with any OTP version, no need for a matrix - container: "ghcr.io/emqx/emqx-builder/5.0-2:24.1.5-2-ubuntu20.04" + container: "ghcr.io/emqx/emqx-builder/5.0-3:24.1.5-3-ubuntu20.04" outputs: old_vsns: ${{ steps.find_old_versons.outputs.old_vsns }} @@ -129,7 +129,7 @@ jobs: - emqx - emqx-enterprise otp: - - 24.1.5-2 + - 24.1.5-3 macos: - macos-11 - macos-10.15 @@ -215,7 +215,7 @@ jobs: - emqx - emqx-enterprise otp: - - 24.1.5-2 # we test with OTP 23, but only build package on OTP 24 versions + - 24.1.5-3 # we test with OTP 23, but only build package on OTP 24 versions arch: - amd64 - arm64 @@ -301,7 +301,7 @@ jobs: -v $(pwd):/emqx \ --workdir /emqx \ --platform linux/$ARCH \ - ghcr.io/emqx/emqx-builder/5.0-2:$OTP-$SYSTEM \ + ghcr.io/emqx/emqx-builder/5.0-3:$OTP-$SYSTEM \ bash -euc "make $PROFILE-zip || cat rebar3.crashdump; \ make $PROFILE-pkg || cat rebar3.crashdump; \ EMQX_NAME=$PROFILE && .ci/build_packages/tests.sh" @@ -336,7 +336,7 @@ jobs: - emqx-enterprise # NOTE: for docker, only support latest otp version, not a matrix otp: - - 24.1.5-2 # update to latest + - 24.1.5-3 # update to latest steps: - uses: actions/download-artifact@v2 @@ -377,7 +377,7 @@ jobs: tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} build-args: | - BUILD_FROM=ghcr.io/emqx/emqx-builder/5.0-2:${{ matrix.otp }}-alpine3.14 + BUILD_FROM=ghcr.io/emqx/emqx-builder/5.0-3:${{ matrix.otp }}-alpine3.14 RUN_FROM=alpine:3.14 EMQX_NAME=${{ matrix.profile }} file: source/deploy/docker/Dockerfile @@ -405,7 +405,7 @@ jobs: - emqx - emqx-enterprise otp: - - 24.1.5-2 + - 24.1.5-3 steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/build_slim_packages.yaml b/.github/workflows/build_slim_packages.yaml index da62e296b..aaa56b30b 100644 --- a/.github/workflows/build_slim_packages.yaml +++ b/.github/workflows/build_slim_packages.yaml @@ -24,12 +24,12 @@ jobs: - emqx - emqx-enterprise otp: - - 24.1.5-2 + - 24.1.5-3 os: - ubuntu20.04 - centos7 - container: "ghcr.io/emqx/emqx-builder/5.0-2:${{ matrix.otp }}-${{ matrix.os }}" + container: "ghcr.io/emqx/emqx-builder/5.0-3:${{ matrix.otp }}-${{ matrix.os }}" steps: - uses: actions/checkout@v1 @@ -55,7 +55,7 @@ jobs: - emqx - emqx-enterprise otp: - - 24.1.5-2 + - 24.1.5-3 macos: - macos-11 - macos-10.15 diff --git a/.github/workflows/check_deps_integrity.yaml b/.github/workflows/check_deps_integrity.yaml index c1a457665..2318b9938 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/5.0-2:24.1.5-2-ubuntu20.04" + container: "ghcr.io/emqx/emqx-builder/5.0-3:24.1.5-3-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 caa4e14ad..1aba6c594 100644 --- a/.github/workflows/run_emqx_app_tests.yaml +++ b/.github/workflows/run_emqx_app_tests.yaml @@ -13,10 +13,10 @@ jobs: matrix: otp: - 23.3.4.9-3 - - 24.1.5-2 + - 24.1.5-3 runs-on: ubuntu-20.04 - container: "ghcr.io/emqx/emqx-builder/5.0-2:${{ matrix.otp }}-ubuntu20.04" + container: "ghcr.io/emqx/emqx-builder/5.0-3:${{ matrix.otp }}-ubuntu20.04" steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/run_fvt_tests.yaml b/.github/workflows/run_fvt_tests.yaml index 45f8d8965..2ca594de6 100644 --- a/.github/workflows/run_fvt_tests.yaml +++ b/.github/workflows/run_fvt_tests.yaml @@ -14,7 +14,7 @@ jobs: prepare: runs-on: ubuntu-20.04 # prepare source with any OTP version, no need for a matrix - container: ghcr.io/emqx/emqx-builder/5.0-2:24.1.5-2-alpine3.14 + container: ghcr.io/emqx/emqx-builder/5.0-3:24.1.5-3-alpine3.14 steps: - uses: actions/checkout@v2 @@ -55,7 +55,7 @@ jobs: - name: make docker image working-directory: source env: - EMQX_BUILDER: ghcr.io/emqx/emqx-builder/5.0-2:24.1.5-2-alpine3.14 + EMQX_BUILDER: ghcr.io/emqx/emqx-builder/5.0-3:24.1.5-3-alpine3.14 run: | make ${{ matrix.profile }}-docker - name: run emqx @@ -100,7 +100,7 @@ jobs: - name: make docker image working-directory: source env: - EMQX_BUILDER: ghcr.io/emqx/emqx-builder/5.0-2:24.1.5-2-alpine3.14 + EMQX_BUILDER: ghcr.io/emqx/emqx-builder/5.0-3:24.1.5-3-alpine3.14 run: | make ${{ matrix.profile }}-docker echo "TARGET=emqx/${{ matrix.profile }}" >> $GITHUB_ENV diff --git a/.github/workflows/run_relup_tests.yaml b/.github/workflows/run_relup_tests.yaml index 18d995d44..3b796d476 100644 --- a/.github/workflows/run_relup_tests.yaml +++ b/.github/workflows/run_relup_tests.yaml @@ -19,10 +19,10 @@ jobs: - emqx - emqx-enterprise otp_vsn: - - 24.1.5-2 + - 24.1.5-3 runs-on: ubuntu-20.04 - container: "ghcr.io/emqx/emqx-builder/5.0-2:${{ matrix.otp_vsn }}-ubuntu20.04" + container: "ghcr.io/emqx/emqx-builder/5.0-3:${{ matrix.otp_vsn }}-ubuntu20.04" defaults: run: diff --git a/.github/workflows/run_test_cases.yaml b/.github/workflows/run_test_cases.yaml index 49e94c322..bb0fb1c82 100644 --- a/.github/workflows/run_test_cases.yaml +++ b/.github/workflows/run_test_cases.yaml @@ -16,7 +16,7 @@ jobs: strategy: matrix: emqx_builder: - - 5.0-2:24.1.5-2 # run dialyzer on latest OTP + - 5.0-3:24.1.5-3 # run dialyzer on latest OTP runs-on: ubuntu-20.04 container: "ghcr.io/emqx/emqx-builder/${{ matrix.emqx_builder }}-ubuntu20.04" @@ -32,7 +32,7 @@ jobs: strategy: matrix: emqx_builder: - - 5.0-2:24.1.5-2 + - 5.0-3:24.1.5-3 runs-on: ubuntu-20.04 container: "ghcr.io/emqx/emqx-builder/${{ matrix.emqx_builder }}-ubuntu20.04" diff --git a/.tool-versions b/.tool-versions index 6d9b11e28..a6568713b 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -erlang 24.1.5-2 +erlang 24.1.5-3 diff --git a/deploy/docker/Dockerfile b/deploy/docker/Dockerfile index 5538c5a0d..a075fcf5d 100644 --- a/deploy/docker/Dockerfile +++ b/deploy/docker/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=ghcr.io/emqx/emqx-builder/5.0-2:24.1.5-2-alpine3.14 +ARG BUILD_FROM=ghcr.io/emqx/emqx-builder/5.0-3:24.1.5-3-alpine3.14 ARG RUN_FROM=alpine:3.14 FROM ${BUILD_FROM} AS builder