From cacb56a25ce0cfd4949df999ac6c2e191abc954a Mon Sep 17 00:00:00 2001 From: Zaiming Shi Date: Tue, 27 Apr 2021 19:39:46 +0200 Subject: [PATCH] build: pin erl23.2.7.2-emqx-1 --- .ci/build_packages/Dockerfile | 2 +- .ci/docker-compose-file/docker-compose.yaml | 2 +- .github/workflows/build_packages.yaml | 4 ++-- .github/workflows/build_slim_packages.yaml | 2 +- .github/workflows/check_deps_integrity.yaml | 2 +- .github/workflows/run_fvt_tests.yaml | 2 +- .github/workflows/run_test_cases.yaml | 4 ++-- .tool-versions | 2 +- deploy/docker/Dockerfile | 2 +- docker.mk | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.ci/build_packages/Dockerfile b/.ci/build_packages/Dockerfile index e27c4d230..3e6fa83c6 100644 --- a/.ci/build_packages/Dockerfile +++ b/.ci/build_packages/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=emqx/build-env:erl23.2.7.1-emqx-1-ubuntu20.04 +ARG BUILD_FROM=emqx/build-env:erl23.2.7.2-emqx-1-ubuntu20.04 FROM ${BUILD_FROM} ARG EMQX_NAME=emqx diff --git a/.ci/docker-compose-file/docker-compose.yaml b/.ci/docker-compose-file/docker-compose.yaml index 64f43d211..869153d86 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: erlang: container_name: erlang - image: emqx/build-env:erl23.2.7.1-emqx-1-ubuntu20.04 + image: emqx/build-env:erl23.2.7.2-emqx-1-ubuntu20.04 env_file: - conf.env environment: diff --git a/.github/workflows/build_packages.yaml b/.github/workflows/build_packages.yaml index 395c0a5cc..e833f0d61 100644 --- a/.github/workflows/build_packages.yaml +++ b/.github/workflows/build_packages.yaml @@ -15,7 +15,7 @@ on: jobs: prepare: runs-on: ubuntu-20.04 - container: emqx/build-env:erl23.2.7.1-emqx-1-ubuntu20.04 + container: emqx/build-env:erl23.2.7.2-emqx-1-ubuntu20.04 outputs: profiles: ${{ steps.set_profile.outputs.profiles}} @@ -267,7 +267,7 @@ jobs: cd - - name: build emqx packages env: - ERL_OTP: erl23.2.7.1-emqx-1 + ERL_OTP: erl23.2.7.2-emqx-1 PROFILE: ${{ matrix.profile }} ARCH: ${{ matrix.arch }} SYSTEM: ${{ matrix.os }} diff --git a/.github/workflows/build_slim_packages.yaml b/.github/workflows/build_slim_packages.yaml index cf110a34a..7dad88eed 100644 --- a/.github/workflows/build_slim_packages.yaml +++ b/.github/workflows/build_slim_packages.yaml @@ -11,7 +11,7 @@ jobs: strategy: matrix: erl_otp: - - erl23.2.7.1-emqx-1 + - erl23.2.7.2-emqx-1 os: - ubuntu20.04 - centos7 diff --git a/.github/workflows/check_deps_integrity.yaml b/.github/workflows/check_deps_integrity.yaml index 238371daa..9b23f27d0 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: emqx/build-env:erl23.2.7.1-emqx-1-ubuntu20.04 + container: emqx/build-env:erl23.2.7.2-emqx-1-ubuntu20.04 steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/run_fvt_tests.yaml b/.github/workflows/run_fvt_tests.yaml index 96b8dc82e..8360d638d 100644 --- a/.github/workflows/run_fvt_tests.yaml +++ b/.github/workflows/run_fvt_tests.yaml @@ -152,7 +152,7 @@ jobs: relup_test: runs-on: ubuntu-20.04 - container: emqx/build-env:erl23.2.7.1-emqx-1-ubuntu20.04 + container: emqx/build-env:erl23.2.7.2-emqx-1-ubuntu20.04 defaults: run: shell: bash diff --git a/.github/workflows/run_test_cases.yaml b/.github/workflows/run_test_cases.yaml index d76a31e04..0b3f8da13 100644 --- a/.github/workflows/run_test_cases.yaml +++ b/.github/workflows/run_test_cases.yaml @@ -13,7 +13,7 @@ on: jobs: run_static_analysis: runs-on: ubuntu-20.04 - container: emqx/build-env:erl23.2.7.1-emqx-1-ubuntu20.04 + container: emqx/build-env:erl23.2.7.2-emqx-1-ubuntu20.04 steps: - uses: actions/checkout@v2 @@ -30,7 +30,7 @@ jobs: run_proper_test: runs-on: ubuntu-20.04 - container: emqx/build-env:erl23.2.7.1-emqx-1-ubuntu20.04 + container: emqx/build-env:erl23.2.7.2-emqx-1-ubuntu20.04 steps: - uses: actions/checkout@v2 diff --git a/.tool-versions b/.tool-versions index 25390c3c6..e7e734a7b 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -erlang 23.2.7.1-emqx-1 +erlang 23.2.7.2-emqx-1 diff --git a/deploy/docker/Dockerfile b/deploy/docker/Dockerfile index f7bfed3b0..1891c39a0 100644 --- a/deploy/docker/Dockerfile +++ b/deploy/docker/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=emqx/build-env:erl23.2.7.1-emqx-1-alpine-amd64 +ARG BUILD_FROM=emqx/build-env:erl23.2.7.2-emqx-1-alpine-amd64 ARG RUN_FROM=alpine:3.12 FROM ${BUILD_FROM} AS builder diff --git a/docker.mk b/docker.mk index b4d267f35..8178e0938 100644 --- a/docker.mk +++ b/docker.mk @@ -62,7 +62,7 @@ docker-build: @docker build --no-cache \ --build-arg PKG_VSN=$(PKG_VSN) \ - --build-arg BUILD_FROM=emqx/build-env:erl23.2.7.1-emqx-1-alpine-$(ARCH) \ + --build-arg BUILD_FROM=emqx/build-env:erl23.2.7.2-emqx-1-alpine-$(ARCH) \ --build-arg RUN_FROM=$(ARCH)/alpine:3.12 \ --build-arg EMQX_NAME=$(EMQX_NAME) \ --build-arg QEMU_ARCH=$(QEMU_ARCH) \