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

chore(CI): Put OTP 23 on trial

This commit is contained in:
Zaiming Shi 2021-01-22 20:56:30 +01:00
parent 6a6a94f99e
commit 197196624e
18 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.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.4.13 image: emqx/build-env:erl23.2.2-ubuntu20.04
depends_on: depends_on:
- mysql_server - mysql_server
- redis_server - redis_server
@ -82,7 +82,7 @@ services:
build: build:
context: ../.. context: ../..
dockerfile: .ci/apps_tests/openldap/Dockerfile dockerfile: .ci/apps_tests/openldap/Dockerfile
args: args:
LDAP_TAG: ${LDAP_TAG} LDAP_TAG: ${LDAP_TAG}
image: emqx-ldap:1.0 image: emqx-ldap:1.0
ports: ports:

2
.ci/build_packages/Dockerfile
View File

@ -1,4 +1,4 @@
ARG BUILD_FROM=emqx/build-env:erl22.3.4.13-ubuntu20.04 ARG BUILD_FROM=emqx/build-env:erl23.2.2-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.4.13 image: emqx/build-env:erl23.2.2-ubuntu20.04
depends_on: depends_on:
- ldap_server - ldap_server
networks: networks:

4
.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.4.13 image: emqx/build-env:erl23.2.2-ubuntu20.04
volumes: volumes:
- ../../:/emqx - ../../:/emqx
working_dir: /emqx working_dir: /emqx
@ -14,7 +14,7 @@ services:
tty: true tty: true
mongo_server: mongo_server:
container_name: mongo container_name: mongo
image: mongo:${MONGO_TAG} image: mongo:${MONGO_TAG}
restart: always restart: always
environment: environment:

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.4.13 image: emqx/build-env:erl23.2.2-ubuntu20.04
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.4.13 image: emqx/build-env:erl23.2.2-ubuntu20.04
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.4.13 image: emqx/build-env:erl23.2.2-ubuntu20.04
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.4.13 image: emqx/build-env:erl23.2.2-ubuntu20.04
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.4.13 image: emqx/build-env:erl23.2.2-ubuntu20.04
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.4.13 image: emqx/build-env:erl23.2.2-ubuntu20.04
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.4.13 image: emqx/build-env:erl23.2.2-ubuntu20.04
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.4.13 image: emqx/build-env:erl23.2.2-ubuntu20.04
volumes: volumes:
- ../..:/emqx - ../..:/emqx
networks: networks:

4
.ci/compatibility_tests/docker-compose-redis-single-tls.yaml
View File

@ -3,7 +3,7 @@ version: '3'
services: services:
erlang: erlang:
container_name: erlang container_name: erlang
image: erlang:22.3.4.13 image: emqx/build-env:erl23.2.2-ubuntu20.04
volumes: volumes:
- ../..:/emqx - ../..:/emqx
networks: networks:
@ -14,7 +14,7 @@ services:
tty: true tty: true
redis_server: redis_server:
container_name: redis container_name: redis
image: redis:${REDIS_TAG} image: redis:${REDIS_TAG}
volumes: volumes:
- ../../apps/emqx_auth_redis/test/emqx_auth_redis_SUITE_data/certs:/tls - ../../apps/emqx_auth_redis/test/emqx_auth_redis_SUITE_data/certs:/tls

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

@ -3,7 +3,7 @@ version: '3'
services: services:
erlang: erlang:
container_name: erlang container_name: erlang
image: erlang:22.3.4.13 image: emqx/build-env:erl23.2.2-ubuntu20.04
volumes: volumes:
- ../..:/emqx - ../..:/emqx
networks: networks:

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

@ -22,7 +22,7 @@ jobs:
- uses: gleam-lang/setup-erlang@v1.1.0 - uses: gleam-lang/setup-erlang@v1.1.0
id: install_erlang id: install_erlang
with: with:
otp-version: 22.3 otp-version: 23.2
- name: build - name: build
run: | run: |
# set-executionpolicy remotesigned -s cu # set-executionpolicy remotesigned -s cu
@ -81,11 +81,11 @@ jobs:
git config --global credential.helper store git config --global credential.helper store
- name: build erlang - name: build erlang
run: | run: |
kerl build 22.3.4.13 kerl build 23.2.2
kerl install 22.3.4.13 $HOME/.kerl/22.3.4.13 kerl install 23.2.2 $HOME/.kerl/23.2.2
- name: build - name: build
run: | run: |
. $HOME/.kerl/22.3.4.13/activate . $HOME/.kerl/23.2.2/activate
make emqx-pkg make emqx-pkg
- name: test - name: test
run: | run: |
@ -155,7 +155,7 @@ jobs:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- name: get deps - name: get deps
env: env:
ERL_OTP: erl22.3.4.13 ERL_OTP: erl23.2.2
run: | run: |
docker run -i --rm \ docker run -i --rm \
-e GITHUB_RUN_ID=$GITHUB_RUN_ID \ -e GITHUB_RUN_ID=$GITHUB_RUN_ID \
@ -191,7 +191,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.4.13 ERL_OTP: erl23.2.2
EMQX: ${{ matrix.emqx }} EMQX: ${{ matrix.emqx }}
ARCH: ${{ matrix.arch }} ARCH: ${{ matrix.arch }}
SYSTEM: ${{ matrix.os }} SYSTEM: ${{ matrix.os }}
@ -245,7 +245,7 @@ jobs:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- name: get deps - name: get deps
env: env:
ERL_OTP: erl22.3.4.13 ERL_OTP: erl23.2.2
run: | run: |
docker run -i --rm \ docker run -i --rm \
-e GITHUB_RUN_ID=$GITHUB_RUN_ID \ -e GITHUB_RUN_ID=$GITHUB_RUN_ID \

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

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

2
deploy/docker/Dockerfile
View File

@ -1,4 +1,4 @@
ARG BUILD_FROM=emqx/build-env:erl22.3-alpine-amd64 ARG BUILD_FROM=emqx/build-env:erl23.2.2-alpine-amd64
ARG RUN_FROM=alpine:3.11 ARG RUN_FROM=alpine:3.11
FROM ${BUILD_FROM} AS builder FROM ${BUILD_FROM} AS builder

6
docker.mk
View File

@ -21,7 +21,7 @@ docker-prepare:
# @echo "PREPARE: Setting up dependencies." # @echo "PREPARE: Setting up dependencies."
# @apt update -y # @apt update -y
# @apt install --only-upgrade docker-ce -y # @apt install --only-upgrade docker-ce -y
## Update docker configuration to enable docker manifest command ## Update docker configuration to enable docker manifest command
@echo "PREPARE: Updating docker configuration" @echo "PREPARE: Updating docker configuration"
@mkdir -p $$HOME/.docker @mkdir -p $$HOME/.docker
@ -45,7 +45,7 @@ docker-build:
## Prepare qemu to build images other then x86_64 on travis ## Prepare qemu to build images other then x86_64 on travis
@echo "PREPARE: Qemu" \ @echo "PREPARE: Qemu" \
&& docker run --rm --privileged multiarch/qemu-user-static:register --reset && docker run --rm --privileged multiarch/qemu-user-static:register --reset
@mkdir -p tmp \ @mkdir -p tmp \
&& cd tmp \ && cd tmp \
&& curl -L -o qemu-$(QEMU_ARCH)-static.tar.gz https://github.com/multiarch/qemu-user-static/releases/download/$(QEMU_VERSION)/qemu-$(QEMU_ARCH)-static.tar.gz \ && curl -L -o qemu-$(QEMU_ARCH)-static.tar.gz https://github.com/multiarch/qemu-user-static/releases/download/$(QEMU_VERSION)/qemu-$(QEMU_ARCH)-static.tar.gz \
@ -54,7 +54,7 @@ docker-build:
@docker build --no-cache \ @docker build --no-cache \
--build-arg PKG_VSN=$(PKG_VSN) \ --build-arg PKG_VSN=$(PKG_VSN) \
--build-arg BUILD_FROM=emqx/build-env:erl22.3-alpine-$(ARCH) \ --build-arg BUILD_FROM=emqx/build-env:erl23.2.2-alpine-$(ARCH) \
--build-arg RUN_FROM=$(ARCH)/alpine:3.11 \ --build-arg RUN_FROM=$(ARCH)/alpine:3.11 \
--build-arg EMQX_NAME=$(EMQX_NAME) \ --build-arg EMQX_NAME=$(EMQX_NAME) \
--build-arg QEMU_ARCH=$(QEMU_ARCH) \ --build-arg QEMU_ARCH=$(QEMU_ARCH) \