Kaynağa Gözat

chore(build): bump to OTP-23.2.7

Zaiming Shi 5 yıl önce
ebeveyn
işleme
1ee0432301

+ 1 - 1
.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

+ 1 - 1
.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

+ 1 - 1
.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:

+ 1 - 1
.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

+ 1 - 1
.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

+ 1 - 1
.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

+ 1 - 1
.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

+ 1 - 1
.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

+ 1 - 1
.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

+ 1 - 1
.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:

+ 1 - 1
.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:

+ 1 - 1
.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:

+ 1 - 1
.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:

+ 1 - 1
.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:

+ 5 - 5
.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 }}

+ 3 - 3
.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

+ 1 - 1
.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

+ 1 - 1
.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

+ 1 - 1
.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

+ 1 - 1
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
 

+ 1 - 1
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) \