From 1ee0432301b445a73c6525c9f0cc2c8d26240c19 Mon Sep 17 00:00:00 2001 From: Zaiming Shi Date: Wed, 17 Mar 2021 12:59:33 +0100 Subject: [PATCH] chore(build): bump to OTP-23.2.7 --- .ci/apps_tests/docker-compose.yaml | 2 +- .ci/build_packages/Dockerfile | 2 +- .ci/compatibility_tests/docker-compose-ldap.yaml | 2 +- .ci/compatibility_tests/docker-compose-mongo-tls.yaml | 2 +- .ci/compatibility_tests/docker-compose-mongo.yaml | 2 +- .ci/compatibility_tests/docker-compose-mysql-tls.yaml | 2 +- .ci/compatibility_tests/docker-compose-mysql.yaml | 2 +- .ci/compatibility_tests/docker-compose-pgsql-tls.yaml | 2 +- .ci/compatibility_tests/docker-compose-pgsql.yaml | 2 +- .../docker-compose-redis-cluster-tls.yaml | 2 +- .../docker-compose-redis-cluster.yaml | 2 +- .../docker-compose-redis-sentinel.yaml | 2 +- .../docker-compose-redis-single-tls.yaml | 2 +- .../docker-compose-redis-single.yaml | 2 +- .github/workflows/build_packages.yaml | 10 +++++----- .github/workflows/build_slim_packages.yaml | 6 +++--- .github/workflows/check_deps_integrity.yaml | 2 +- .github/workflows/run_fvt_tests.yaml | 2 +- .github/workflows/run_test_cases.yaml | 2 +- deploy/docker/Dockerfile | 2 +- docker.mk | 2 +- 21 files changed, 27 insertions(+), 27 deletions(-) diff --git a/.ci/apps_tests/docker-compose.yaml b/.ci/apps_tests/docker-compose.yaml index 42cfe82f6..2df39fe6f 100644 --- a/.ci/apps_tests/docker-compose.yaml +++ b/.ci/apps_tests/docker-compose.yaml @@ -3,7 +3,7 @@ version: '3' services: erlang: container_name: erlang - image: emqx/build-env:erl23.2.2-ubuntu20.04 + image: emqx/build-env:erl23.2.7-ubuntu20.04 depends_on: - mysql_server - redis_server diff --git a/.ci/build_packages/Dockerfile b/.ci/build_packages/Dockerfile index 197b7e731..92450440d 100644 --- a/.ci/build_packages/Dockerfile +++ b/.ci/build_packages/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=emqx/build-env:erl23.2.2-ubuntu20.04 +ARG BUILD_FROM=emqx/build-env:erl23.2.7-ubuntu20.04 FROM ${BUILD_FROM} ARG EMQX_NAME=emqx diff --git a/.ci/compatibility_tests/docker-compose-ldap.yaml b/.ci/compatibility_tests/docker-compose-ldap.yaml index 33b37e00c..1c47756d5 100644 --- a/.ci/compatibility_tests/docker-compose-ldap.yaml +++ b/.ci/compatibility_tests/docker-compose-ldap.yaml @@ -3,7 +3,7 @@ version: '3' services: erlang: container_name: erlang - image: emqx/build-env:erl23.2.2-ubuntu20.04 + image: emqx/build-env:erl23.2.7-ubuntu20.04 depends_on: - ldap_server networks: diff --git a/.ci/compatibility_tests/docker-compose-mongo-tls.yaml b/.ci/compatibility_tests/docker-compose-mongo-tls.yaml index 1611534f6..610056121 100644 --- a/.ci/compatibility_tests/docker-compose-mongo-tls.yaml +++ b/.ci/compatibility_tests/docker-compose-mongo-tls.yaml @@ -3,7 +3,7 @@ version: '3' services: erlang: container_name: erlang - image: emqx/build-env:erl23.2.2-ubuntu20.04 + image: emqx/build-env:erl23.2.7-ubuntu20.04 volumes: - ../../:/emqx working_dir: /emqx diff --git a/.ci/compatibility_tests/docker-compose-mongo.yaml b/.ci/compatibility_tests/docker-compose-mongo.yaml index 2f769ac63..c3e2a1d66 100644 --- a/.ci/compatibility_tests/docker-compose-mongo.yaml +++ b/.ci/compatibility_tests/docker-compose-mongo.yaml @@ -3,7 +3,7 @@ version: '3' services: erlang: container_name: erlang - image: emqx/build-env:erl23.2.2-ubuntu20.04 + image: emqx/build-env:erl23.2.7-ubuntu20.04 volumes: - ../..:/emqx working_dir: /emqx diff --git a/.ci/compatibility_tests/docker-compose-mysql-tls.yaml b/.ci/compatibility_tests/docker-compose-mysql-tls.yaml index ab9cbeed3..f3c9142ed 100644 --- a/.ci/compatibility_tests/docker-compose-mysql-tls.yaml +++ b/.ci/compatibility_tests/docker-compose-mysql-tls.yaml @@ -3,7 +3,7 @@ version: '3' services: erlang: container_name: erlang - image: emqx/build-env:erl23.2.2-ubuntu20.04 + image: emqx/build-env:erl23.2.7-ubuntu20.04 volumes: - ../../:/emqx working_dir: /emqx diff --git a/.ci/compatibility_tests/docker-compose-mysql.yaml b/.ci/compatibility_tests/docker-compose-mysql.yaml index 9fe8d1a33..adc3aa97f 100644 --- a/.ci/compatibility_tests/docker-compose-mysql.yaml +++ b/.ci/compatibility_tests/docker-compose-mysql.yaml @@ -3,7 +3,7 @@ version: '3' services: erlang: container_name: erlang - image: emqx/build-env:erl23.2.2-ubuntu20.04 + image: emqx/build-env:erl23.2.7-ubuntu20.04 volumes: - ../../:/emqx working_dir: /emqx diff --git a/.ci/compatibility_tests/docker-compose-pgsql-tls.yaml b/.ci/compatibility_tests/docker-compose-pgsql-tls.yaml index 6bb3d321e..fd9855c01 100644 --- a/.ci/compatibility_tests/docker-compose-pgsql-tls.yaml +++ b/.ci/compatibility_tests/docker-compose-pgsql-tls.yaml @@ -3,7 +3,7 @@ version: '3' services: erlang: container_name: erlang - image: emqx/build-env:erl23.2.2-ubuntu20.04 + image: emqx/build-env:erl23.2.7-ubuntu20.04 volumes: - ../../:/emqx working_dir: /emqx diff --git a/.ci/compatibility_tests/docker-compose-pgsql.yaml b/.ci/compatibility_tests/docker-compose-pgsql.yaml index c5492d971..5204d85c9 100644 --- a/.ci/compatibility_tests/docker-compose-pgsql.yaml +++ b/.ci/compatibility_tests/docker-compose-pgsql.yaml @@ -3,7 +3,7 @@ version: '3' services: erlang: container_name: erlang - image: emqx/build-env:erl23.2.2-ubuntu20.04 + image: emqx/build-env:erl23.2.7-ubuntu20.04 volumes: - ../../:/emqx working_dir: /emqx diff --git a/.ci/compatibility_tests/docker-compose-redis-cluster-tls.yaml b/.ci/compatibility_tests/docker-compose-redis-cluster-tls.yaml index 06518854f..bc9e24931 100644 --- a/.ci/compatibility_tests/docker-compose-redis-cluster-tls.yaml +++ b/.ci/compatibility_tests/docker-compose-redis-cluster-tls.yaml @@ -5,7 +5,7 @@ version: '2.4' services: erlang: container_name: erlang - image: emqx/build-env:erl23.2.2-ubuntu20.04 + image: emqx/build-env:erl23.2.7-ubuntu20.04 volumes: - ../..:/emqx networks: diff --git a/.ci/compatibility_tests/docker-compose-redis-cluster.yaml b/.ci/compatibility_tests/docker-compose-redis-cluster.yaml index 213a06866..bdbcf11af 100644 --- a/.ci/compatibility_tests/docker-compose-redis-cluster.yaml +++ b/.ci/compatibility_tests/docker-compose-redis-cluster.yaml @@ -5,7 +5,7 @@ version: '2.4' services: erlang: container_name: erlang - image: emqx/build-env:erl23.2.2-ubuntu20.04 + image: emqx/build-env:erl23.2.7-ubuntu20.04 volumes: - ../..:/emqx networks: diff --git a/.ci/compatibility_tests/docker-compose-redis-sentinel.yaml b/.ci/compatibility_tests/docker-compose-redis-sentinel.yaml index b2b58fefe..134724da7 100644 --- a/.ci/compatibility_tests/docker-compose-redis-sentinel.yaml +++ b/.ci/compatibility_tests/docker-compose-redis-sentinel.yaml @@ -5,7 +5,7 @@ version: '2.4' services: erlang: container_name: erlang - image: emqx/build-env:erl23.2.2-ubuntu20.04 + image: emqx/build-env:erl23.2.7-ubuntu20.04 volumes: - ../..:/emqx networks: diff --git a/.ci/compatibility_tests/docker-compose-redis-single-tls.yaml b/.ci/compatibility_tests/docker-compose-redis-single-tls.yaml index 03d643754..0e0a0dd25 100644 --- a/.ci/compatibility_tests/docker-compose-redis-single-tls.yaml +++ b/.ci/compatibility_tests/docker-compose-redis-single-tls.yaml @@ -3,7 +3,7 @@ version: '3' services: erlang: container_name: erlang - image: emqx/build-env:erl23.2.2-ubuntu20.04 + image: emqx/build-env:erl23.2.7-ubuntu20.04 volumes: - ../..:/emqx networks: diff --git a/.ci/compatibility_tests/docker-compose-redis-single.yaml b/.ci/compatibility_tests/docker-compose-redis-single.yaml index 5d7acb865..b603758ab 100644 --- a/.ci/compatibility_tests/docker-compose-redis-single.yaml +++ b/.ci/compatibility_tests/docker-compose-redis-single.yaml @@ -3,7 +3,7 @@ version: '3' services: erlang: container_name: erlang - image: emqx/build-env:erl23.2.2-ubuntu20.04 + image: emqx/build-env:erl23.2.7-ubuntu20.04 volumes: - ../..:/emqx networks: diff --git a/.github/workflows/build_packages.yaml b/.github/workflows/build_packages.yaml index f0c9aa2a3..e22a97d86 100644 --- a/.github/workflows/build_packages.yaml +++ b/.github/workflows/build_packages.yaml @@ -63,11 +63,11 @@ jobs: - name: build erlang timeout-minutes: 60 run: | - kerl build 23.2.2 - kerl install 23.2.2 $HOME/.kerl/23.2.2 + kerl build 23.2.7 + kerl install 23.2.7 $HOME/.kerl/23.2.7 - name: build run: | - . $HOME/.kerl/23.2.2/activate + . $HOME/.kerl/23.2.7/activate make emqx-pkg - name: test run: | @@ -149,7 +149,7 @@ jobs: - uses: actions/checkout@v1 - name: get deps env: - ERL_OTP: erl23.2.2 + ERL_OTP: erl23.2.7 run: | docker run -i --rm \ -e GITHUB_RUN_ID=$GITHUB_RUN_ID \ @@ -184,7 +184,7 @@ jobs: cd - - name: build emqx packages env: - ERL_OTP: erl23.2.2 + ERL_OTP: erl23.2.7 EMQX: ${{ matrix.emqx }} ARCH: ${{ matrix.arch }} SYSTEM: ${{ matrix.os }} diff --git a/.github/workflows/build_slim_packages.yaml b/.github/workflows/build_slim_packages.yaml index 217e06917..658bae2e8 100644 --- a/.github/workflows/build_slim_packages.yaml +++ b/.github/workflows/build_slim_packages.yaml @@ -5,17 +5,17 @@ on: [pull_request] jobs: build: runs-on: ubuntu-20.04 - + strategy: matrix: erl_otp: - - erl23.2.2 + - erl23.2.7 os: - ubuntu20.04 - centos8 container: emqx/build-env:${{ matrix.erl_otp }}-${{ matrix.os }} - + steps: - uses: actions/checkout@v1 - name: build packages diff --git a/.github/workflows/check_deps_integrity.yaml b/.github/workflows/check_deps_integrity.yaml index 91e25e203..4eeefe46c 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.2-ubuntu20.04 + container: emqx/build-env:erl23.2.7-ubuntu20.04 steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/run_fvt_tests.yaml b/.github/workflows/run_fvt_tests.yaml index 04638ca08..0d557b605 100644 --- a/.github/workflows/run_fvt_tests.yaml +++ b/.github/workflows/run_fvt_tests.yaml @@ -114,7 +114,7 @@ jobs: relup_test: runs-on: ubuntu-20.04 - container: emqx/build-env:erl23.2.2-ubuntu20.04 + container: emqx/build-env:erl23.2.7-ubuntu20.04 defaults: run: shell: bash diff --git a/.github/workflows/run_test_cases.yaml b/.github/workflows/run_test_cases.yaml index 0a2f13eca..2eb7855d5 100644 --- a/.github/workflows/run_test_cases.yaml +++ b/.github/workflows/run_test_cases.yaml @@ -12,7 +12,7 @@ on: jobs: run_static_analysis: runs-on: ubuntu-20.04 - container: emqx/build-env:erl23.2.2-ubuntu20.04 + container: emqx/build-env:erl23.2.7-ubuntu20.04 steps: - uses: actions/checkout@v2 diff --git a/deploy/docker/Dockerfile b/deploy/docker/Dockerfile index b3ca6f4c8..288c79cec 100644 --- a/deploy/docker/Dockerfile +++ b/deploy/docker/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=emqx/build-env:erl23.2.2-alpine-amd64 +ARG BUILD_FROM=emqx/build-env:erl23.2.7-alpine-amd64 ARG RUN_FROM=alpine:3.12 FROM ${BUILD_FROM} AS builder diff --git a/docker.mk b/docker.mk index 142fff92e..074d8b698 100644 --- a/docker.mk +++ b/docker.mk @@ -58,7 +58,7 @@ docker-build: @docker build --no-cache \ --build-arg PKG_VSN=$(PKG_VSN) \ - --build-arg BUILD_FROM=emqx/build-env:erl23.2.2-alpine-$(ARCH) \ + --build-arg BUILD_FROM=emqx/build-env:erl23.2.7-alpine-$(ARCH) \ --build-arg RUN_FROM=$(ARCH)/alpine:3.12 \ --build-arg EMQX_NAME=$(EMQX_NAME) \ --build-arg QEMU_ARCH=$(QEMU_ARCH) \