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

Merge pull request #6246 from zmstone/upgrade-otp-to-23.2.7.2-emqx-3 

build: upgrade to otp sed 23.2.7.2-emqx-3
This commit is contained in:
Zaiming (Stone) Shi 2021-11-23 21:38:19 +01:00 committed by GitHub
parent b6064ce2c0 c4b0008ebd
commit 2e26b8dfed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.ci/build_packages/Dockerfile
View File

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

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

@ -3,7 +3,7 @@ version: '3.9'
services: services:
erlang: erlang:
container_name: erlang container_name: erlang
image: emqx/build-env:erl23.2.7.2-emqx-2-ubuntu20.04 image: emqx/build-env:erl23.2.7.2-emqx-3-ubuntu20.04
env_file: env_file:
- conf.env - conf.env
environment: environment:

2
.ci/fvt_tests/local_relup_test_run.sh
View File

@ -28,7 +28,7 @@ exec docker run \
-v "$TEMPDIR:/relup_test" \ -v "$TEMPDIR:/relup_test" \
-w "/relup_test" \ -w "/relup_test" \
-e REBAR_COLOR=none \ -e REBAR_COLOR=none \
-it emqx/relup-test-env:erl23.2.7.2-emqx-2-ubuntu20.04 \ -it emqx/relup-test-env:erl23.2.7.2-emqx-3-ubuntu20.04 \
lux \ lux \
--progress verbose \ --progress verbose \
--case_timeout infinity \ --case_timeout infinity \

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

@ -11,7 +11,7 @@ on:
jobs: jobs:
prepare: prepare:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
container: emqx/build-env:erl23.2.7.2-emqx-2-ubuntu20.04 container: emqx/build-env:erl23.2.7.2-emqx-3-ubuntu20.04
outputs: outputs:
profiles: ${{ steps.set_profile.outputs.profiles}} profiles: ${{ steps.set_profile.outputs.profiles}}
@ -134,7 +134,7 @@ jobs:
matrix: matrix:
profile: ${{fromJSON(needs.prepare.outputs.profiles)}} profile: ${{fromJSON(needs.prepare.outputs.profiles)}}
erl_otp: erl_otp:
- 23.2.7.2-emqx-2 - 23.2.7.2-emqx-3
exclude: exclude:
- profile: emqx-edge - profile: emqx-edge
@ -291,7 +291,7 @@ jobs:
done done
- name: build emqx packages - name: build emqx packages
env: env:
ERL_OTP: erl23.2.7.2-emqx-2 ERL_OTP: erl23.2.7.2-emqx-3
PROFILE: ${{ matrix.profile }} PROFILE: ${{ matrix.profile }}
ARCH: ${{ matrix.arch }} ARCH: ${{ matrix.arch }}
SYSTEM: ${{ matrix.os }} SYSTEM: ${{ matrix.os }}

4
.github/workflows/build_slim_packages.yaml vendored
View File

@ -15,7 +15,7 @@ jobs:
strategy: strategy:
matrix: matrix:
erl_otp: erl_otp:
- erl23.2.7.2-emqx-2 - erl23.2.7.2-emqx-3
os: os:
- ubuntu20.04 - ubuntu20.04
- centos7 - centos7
@ -58,7 +58,7 @@ jobs:
strategy: strategy:
matrix: matrix:
erl_otp: erl_otp:
- 23.2.7.2-emqx-2 - 23.2.7.2-emqx-3
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1

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

@ -5,7 +5,7 @@ on: [pull_request]
jobs: jobs:
check_deps_integrity: check_deps_integrity:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
container: emqx/build-env:erl23.2.7.2-emqx-2-ubuntu20.04 container: emqx/build-env:erl23.2.7.2-emqx-3-ubuntu20.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2

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

@ -5,7 +5,7 @@ on: workflow_dispatch
jobs: jobs:
test: test:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
container: emqx/build-env:erl23.2.7.2-emqx-2-ubuntu20.04 container: emqx/build-env:erl23.2.7.2-emqx-3-ubuntu20.04
strategy: strategy:
fail-fast: true fail-fast: true
env: env:

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

@ -180,7 +180,7 @@ jobs:
relup_test_plan: relup_test_plan:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
container: emqx/build-env:erl23.2.7.2-emqx-2-ubuntu20.04 container: emqx/build-env:erl23.2.7.2-emqx-3-ubuntu20.04
outputs: outputs:
profile: ${{ steps.profile-and-versions.outputs.profile }} profile: ${{ steps.profile-and-versions.outputs.profile }}
vsn: ${{ steps.profile-and-versions.outputs.vsn }} vsn: ${{ steps.profile-and-versions.outputs.vsn }}
@ -229,7 +229,7 @@ jobs:
relup_test_build: relup_test_build:
needs: relup_test_plan needs: relup_test_plan
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
container: emqx/build-env:erl23.2.7.2-emqx-2-ubuntu20.04 container: emqx/build-env:erl23.2.7.2-emqx-3-ubuntu20.04
defaults: defaults:
run: run:
shell: bash shell: bash
@ -273,7 +273,7 @@ jobs:
- relup_test_plan - relup_test_plan
- relup_test_build - relup_test_build
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
container: emqx/relup-test-env:erl23.2.7.2-emqx-2-ubuntu20.04 container: emqx/relup-test-env:erl23.2.7.2-emqx-3-ubuntu20.04
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:

4
.github/workflows/run_test_cases.yaml vendored
View File

@ -10,7 +10,7 @@ on:
jobs: jobs:
run_static_analysis: run_static_analysis:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
container: emqx/build-env:erl23.2.7.2-emqx-2-ubuntu20.04 container: emqx/build-env:erl23.2.7.2-emqx-3-ubuntu20.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
@ -27,7 +27,7 @@ jobs:
run_proper_test: run_proper_test:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
container: emqx/build-env:erl23.2.7.2-emqx-2-ubuntu20.04 container: emqx/build-env:erl23.2.7.2-emqx-3-ubuntu20.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2

2
deploy/docker/Dockerfile
View File

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

2
docker.mk
View File

@ -64,7 +64,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:erl23.2.7.2-emqx-2-alpine-$(ARCH) \ --build-arg BUILD_FROM=emqx/build-env:erl23.2.7.2-emqx-3-alpine \
--build-arg RUN_FROM=$(ARCH)/alpine:3.12 \ --build-arg RUN_FROM=$(ARCH)/alpine:3.12 \
--build-arg EMQX_NAME=$(EMQX_NAME) \ --build-arg EMQX_NAME=$(EMQX_NAME) \
--build-arg QEMU_ARCH=$(QEMU_ARCH) \ --build-arg QEMU_ARCH=$(QEMU_ARCH) \