yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore(CI): update erlang version

This commit is contained in:
zhanghongtong 2021-01-18 16:12:48 +08:00 committed by Rory Z
parent fd2e9f147b
commit e2389ab8e7
16 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.ci/apps_tests/docker-compose.yaml
View File

@ -3,7 +3,7 @@ version: '3'
services: services:
erlang: erlang:
container_name: erlang container_name: erlang
image: erlang:22.3 image: erlang:22.3.4.13
depends_on: depends_on:
- mysql_server - mysql_server
- redis_server - redis_server

2
.ci/build_packages/Dockerfile
View File

@ -1,4 +1,4 @@
ARG BUILD_FROM=emqx/build-env:erl22.3-ubuntu20.04 ARG BUILD_FROM=emqx/build-env:erl22.3.4.13-ubuntu20.04
FROM ${BUILD_FROM} FROM ${BUILD_FROM}
ARG EMQX_NAME=emqx ARG EMQX_NAME=emqx

2
.ci/compatibility_tests/docker-compose-ldap.yaml
View File

@ -3,7 +3,7 @@ version: '3'
services: services:
erlang: erlang:
container_name: erlang container_name: erlang
image: erlang:22.3 image: erlang:22.3.4.13
depends_on: depends_on:
- ldap_server - ldap_server
networks: networks:

2
.ci/compatibility_tests/docker-compose-mongo-tls.yaml
View File

@ -3,7 +3,7 @@ version: '3'
services: services:
erlang: erlang:
container_name: erlang container_name: erlang
image: erlang:22.3 image: erlang:22.3.4.13
volumes: volumes:
- ../../:/emqx - ../../:/emqx
working_dir: /emqx working_dir: /emqx

2
.ci/compatibility_tests/docker-compose-mongo.yaml
View File

@ -3,7 +3,7 @@ version: '3'
services: services:
erlang: erlang:
container_name: erlang container_name: erlang
image: erlang:22.3 image: erlang:22.3.4.13
volumes: volumes:
- ../..:/emqx - ../..:/emqx
working_dir: /emqx working_dir: /emqx

2
.ci/compatibility_tests/docker-compose-mysql-tls.yaml
View File

@ -3,7 +3,7 @@ version: '3'
services: services:
erlang: erlang:
container_name: erlang container_name: erlang
image: erlang:22.3 image: erlang:22.3.4.13
volumes: volumes:
- ../../:/emqx - ../../:/emqx
working_dir: /emqx working_dir: /emqx

2
.ci/compatibility_tests/docker-compose-mysql.yaml
View File

@ -3,7 +3,7 @@ version: '3'
services: services:
erlang: erlang:
container_name: erlang container_name: erlang
image: erlang:22.3 image: erlang:22.3.4.13
volumes: volumes:
- ../../:/emqx - ../../:/emqx
working_dir: /emqx working_dir: /emqx

2
.ci/compatibility_tests/docker-compose-pgsql-tls.yaml
View File

@ -3,7 +3,7 @@ version: '3'
services: services:
erlang: erlang:
container_name: erlang container_name: erlang
image: erlang:22.3 image: erlang:22.3.4.13
volumes: volumes:
- ../../:/emqx - ../../:/emqx
working_dir: /emqx working_dir: /emqx

2
.ci/compatibility_tests/docker-compose-pgsql.yaml
View File

@ -3,7 +3,7 @@ version: '3'
services: services:
erlang: erlang:
container_name: erlang container_name: erlang
image: erlang:22.3 image: erlang:22.3.4.13
volumes: volumes:
- ../../:/emqx - ../../:/emqx
working_dir: /emqx working_dir: /emqx

2
.ci/compatibility_tests/docker-compose-redis-cluster-tls.yaml
View File

@ -5,7 +5,7 @@ version: '2.4'
services: services:
erlang: erlang:
container_name: erlang container_name: erlang
image: erlang:22.3 image: erlang:22.3.4.13
volumes: volumes:
- ../..:/emqx - ../..:/emqx
networks: networks:

2
.ci/compatibility_tests/docker-compose-redis-cluster.yaml
View File

@ -5,7 +5,7 @@ version: '2.4'
services: services:
erlang: erlang:
container_name: erlang container_name: erlang
image: erlang:22.3 image: erlang:22.3.4.13
volumes: volumes:
- ../..:/emqx - ../..:/emqx
networks: networks:

2
.ci/compatibility_tests/docker-compose-redis-sentinel.yaml
View File

@ -5,7 +5,7 @@ version: '2.4'
services: services:
erlang: erlang:
container_name: erlang container_name: erlang
image: erlang:22.3 image: erlang:22.3.4.13
volumes: volumes:
- ../..:/emqx - ../..:/emqx
networks: networks:

2
.ci/compatibility_tests/docker-compose-redis-singer-tls.yaml
View File

@ -3,7 +3,7 @@ version: '3'
services: services:
erlang: erlang:
container_name: erlang container_name: erlang
image: erlang:22.3 image: erlang:22.3.4.13
volumes: volumes:
- ../..:/emqx - ../..:/emqx
networks: networks:

2
.ci/compatibility_tests/docker-compose-redis-singer.yaml
View File

@ -3,7 +3,7 @@ version: '3'
services: services:
erlang: erlang:
container_name: erlang container_name: erlang
image: erlang:22.3 image: erlang:22.3.4.13
volumes: volumes:
- ../..:/emqx - ../..:/emqx
networks: networks:

10
.github/workflows/build_packages.yaml vendored
View File

@ -153,13 +153,15 @@ jobs:
docker run --rm --privileged tonistiigi/binfmt --install all docker run --rm --privileged tonistiigi/binfmt --install all
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- name: get deps - name: get deps
env:
ERL_OTP: erl22.3.4.13
run: | run: |
docker run -i --rm \ docker run -i --rm \
-e GITHUB_RUN_ID=$GITHUB_RUN_ID \ -e GITHUB_RUN_ID=$GITHUB_RUN_ID \
-e GITHUB_REF=$GITHUB_REF \ -e GITHUB_REF=$GITHUB_REF \
-v $(pwd):/emqx \ -v $(pwd):/emqx \
-w /emqx \ -w /emqx \
emqx/build-env:erl22.3-debian10 \ emqx/build-env:${ERL_OTP}-debian10 \
bash -c "make deps-all" bash -c "make deps-all"
- name: downloads emqx zip packages - name: downloads emqx zip packages
env: env:
@ -188,7 +190,7 @@ jobs:
- name: build emqx packages - name: build emqx packages
if: (matrix.arch == 'amd64' && matrix.emqx == 'emqx') || startsWith(github.ref, 'refs/tags/') if: (matrix.arch == 'amd64' && matrix.emqx == 'emqx') || startsWith(github.ref, 'refs/tags/')
env: env:
ERL_OTP: erl22.3 ERL_OTP: erl22.3.4.13
EMQX: ${{ matrix.emqx }} EMQX: ${{ matrix.emqx }}
ARCH: ${{ matrix.arch }} ARCH: ${{ matrix.arch }}
SYSTEM: ${{ matrix.os }} SYSTEM: ${{ matrix.os }}
@ -241,13 +243,15 @@ jobs:
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- name: get deps - name: get deps
env:
ERL_OTP: erl22.3.4.13
run: | run: |
docker run -i --rm \ docker run -i --rm \
-e GITHUB_RUN_ID=$GITHUB_RUN_ID \ -e GITHUB_RUN_ID=$GITHUB_RUN_ID \
-e GITHUB_REF=$GITHUB_REF \ -e GITHUB_REF=$GITHUB_REF \
-v $(pwd):/emqx \ -v $(pwd):/emqx \
-w /emqx \ -w /emqx \
emqx/build-env:erl22.3-alpine-amd64 \ emqx/build-env:${ERL_OTP}-alpine-amd64 \
sh -c "make deps-emqx" sh -c "make deps-emqx"
- name: build emqx docker image - name: build emqx docker image
env: env:

2
.github/workflows/run_fvt_tests.yaml vendored
View File

@ -111,7 +111,7 @@ jobs:
relup_test: relup_test:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
container: emqx/build-env:erl22.3-ubuntu20.04 container: emqx/build-env:erl22.3.4.13-ubuntu20.04
defaults: defaults:
run: run:
shell: bash shell: bash