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

Merge pull request #5450 from zmstone/chore-update-otp-version-for-ci 

chore: update otp version in CI
This commit is contained in:
Zaiming (Stone) Shi 2021-08-11 14:02:54 +02:00 committed by GitHub
parent 258191a5b4 bf94051d56
commit 64ddb13d8e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,7 +23,7 @@ services:
erlang24: erlang24:
container_name: erlang24 container_name: erlang24
image: emqx/build-env:erl24.0.1-emqx-1-ubuntu20.04 image: emqx/build-env:erl24.0.5-emqx-1-ubuntu20.04
env_file: env_file:
- conf.env - conf.env
environment: environment:

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

@ -14,7 +14,7 @@ jobs:
matrix: matrix:
container: container:
- "emqx/build-env:erl23.2.7.2-emqx-2-ubuntu20.04" - "emqx/build-env:erl23.2.7.2-emqx-2-ubuntu20.04"
- "emqx/build-env:erl24.0.1-emqx-1-ubuntu20.04" - "emqx/build-env:erl24.0.5-emqx-1-ubuntu20.04"
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
container: ${{ matrix.container }} container: ${{ matrix.container }}
@ -85,7 +85,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: 23.2 otp-version: 24.0.5
- name: build - name: build
env: env:
PYTHON: python PYTHON: python
@ -141,7 +141,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 - 24.0.5-emqx-1
exclude: exclude:
- profile: emqx-edge - profile: emqx-edge
@ -221,7 +221,7 @@ jobs:
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-2
- 24.0.1-emqx-1 - 24.0.5-emqx-1
arch: arch:
- amd64 - amd64
- arm64 - arm64
@ -237,8 +237,6 @@ jobs:
- centos6 - centos6
- raspbian10 - raspbian10
# - raspbian9 # - raspbian9
erl_otp:
- 23.2.7.2-emqx-2
exclude: exclude:
- os: centos6 - os: centos6
arch: arm64 arch: arm64
@ -341,7 +339,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 - 24.0.5-emqx-1
steps: steps:
- uses: actions/download-artifact@v2 - uses: actions/download-artifact@v2

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

@ -15,8 +15,7 @@ jobs:
strategy: strategy:
matrix: matrix:
erl_otp: erl_otp:
- erl23.2.7.2-emqx-2 - erl24.0.5-emqx-1
- erl24.0.1-emqx-1
os: os:
- ubuntu20.04 - ubuntu20.04
@ -60,7 +59,7 @@ jobs:
strategy: strategy:
matrix: matrix:
erl_otp: erl_otp:
- 23.2.7.2-emqx-2 - 24.0.5-emqx-1
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1

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

@ -7,8 +7,7 @@ jobs:
strategy: strategy:
matrix: matrix:
container: container:
- "emqx/build-env:erl23.2.7.2-emqx-2-ubuntu20.04" - "emqx/build-env:erl24.0.5-emqx-1-ubuntu20.04"
- "emqx/build-env:erl24.0.1-emqx-1-ubuntu20.04"
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
container: ${{ matrix.container }} container: ${{ matrix.container }}

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

@ -13,7 +13,7 @@ jobs:
matrix: matrix:
container: container:
- "emqx/build-env:erl23.2.7.2-emqx-2-ubuntu20.04" - "emqx/build-env:erl23.2.7.2-emqx-2-ubuntu20.04"
- "emqx/build-env:erl24.0.1-emqx-1-ubuntu20.04" - "emqx/build-env:erl24.0.5-emqx-1-ubuntu20.04"
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
container: ${{ matrix.container }} container: ${{ matrix.container }}

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

@ -16,7 +16,7 @@ jobs:
- uses: gleam-lang/setup-erlang@v1.1.2 - uses: gleam-lang/setup-erlang@v1.1.2
id: install_erlang id: install_erlang
with: with:
otp-version: 23.2 otp-version: 24.0.5
- name: prepare - name: prepare
run: | run: |
if make emqx-ee --dry-run > /dev/null 2>&1; then if make emqx-ee --dry-run > /dev/null 2>&1; then
@ -75,7 +75,7 @@ jobs:
- uses: gleam-lang/setup-erlang@v1.1.2 - uses: gleam-lang/setup-erlang@v1.1.2
id: install_erlang id: install_erlang
with: with:
otp-version: 23.2 otp-version: 24.0.5
- name: prepare - name: prepare
run: | run: |
if make emqx-ee --dry-run > /dev/null 2>&1; then if make emqx-ee --dry-run > /dev/null 2>&1; then
@ -190,7 +190,7 @@ jobs:
matrix: matrix:
container: container:
- "emqx/build-env:erl23.2.7.2-emqx-2-ubuntu20.04" - "emqx/build-env:erl23.2.7.2-emqx-2-ubuntu20.04"
- "emqx/build-env:erl24.0.1-emqx-1-ubuntu20.04" - "emqx/build-env:erl24.0.5-emqx-1-ubuntu20.04"
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
container: ${{ matrix.container }} container: ${{ matrix.container }}

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

@ -13,7 +13,7 @@ jobs:
matrix: matrix:
container: container:
- "emqx/build-env:erl23.2.7.2-emqx-2-ubuntu20.04" - "emqx/build-env:erl23.2.7.2-emqx-2-ubuntu20.04"
- "emqx/build-env:erl24.0.1-emqx-1-ubuntu20.04" - "emqx/build-env:erl24.0.5-emqx-1-ubuntu20.04"
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
container: ${{ matrix.container }} container: ${{ matrix.container }}
@ -36,7 +36,7 @@ jobs:
matrix: matrix:
container: container:
- "emqx/build-env:erl23.2.7.2-emqx-2-ubuntu20.04" - "emqx/build-env:erl23.2.7.2-emqx-2-ubuntu20.04"
- "emqx/build-env:erl24.0.1-emqx-1-ubuntu20.04" - "emqx/build-env:erl24.0.5-emqx-1-ubuntu20.04"
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
container: ${{ matrix.container }} container: ${{ matrix.container }}