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

chore(CI): change otp version for workflows

This commit is contained in:
zhanghongtong 2021-10-20 13:58:16 +08:00 committed by x1001100011
parent 15205942e0
commit b0e579fcd8
8 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,7 +14,7 @@ jobs:
matrix: matrix:
otp: otp:
- "23.2.7.2-emqx-2" - "23.2.7.2-emqx-2"
- "24.0.5-emqx-1" - "24.1.1-emqx-1"
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
container: "ghcr.io/emqx/emqx-builder-helper/5.0:${{ matrix.otp }}-ubuntu20.04" container: "ghcr.io/emqx/emqx-builder-helper/5.0:${{ matrix.otp }}-ubuntu20.04"
@ -83,7 +83,7 @@ jobs:
steps: steps:
- uses: actions/download-artifact@v2 - uses: actions/download-artifact@v2
with: with:
name: source-23.2.7.2-emqx-2 name: source-24.1.1-emqx-1
path: . path: .
- name: unzip source code - name: unzip source code
run: Expand-Archive -Path source-23.2.7.2-emqx-2.zip -DestinationPath ./ run: Expand-Archive -Path source-23.2.7.2-emqx-2.zip -DestinationPath ./
@ -92,7 +92,7 @@ jobs:
id: install_erlang id: install_erlang
## gleam-lang/setup-erlang does not yet support the installation of otp24 on windows ## gleam-lang/setup-erlang does not yet support the installation of otp24 on windows
with: with:
otp-version: 23.2 otp-version: 24.1
- name: build - name: build
env: env:
PYTHON: python PYTHON: python
@ -151,7 +151,7 @@ jobs:
- macos-11 - macos-11
- macos-10.15 - macos-10.15
otp: otp:
- 24.0.5-emqx-1 - 24.1.1-emqx-1
exclude: exclude:
- profile: emqx-edge - profile: emqx-edge
@ -244,7 +244,7 @@ jobs:
- arm64 - arm64
otp: otp:
- 23.2.7.2-emqx-2 - 23.2.7.2-emqx-2
- 24.0.5-emqx-1 - 24.1.1-emqx-1
exclude: exclude:
- os: centos6 - os: centos6
arch: arm64 arch: arm64
@ -347,7 +347,7 @@ jobs:
matrix: matrix:
profile: ${{fromJSON(needs.prepare.outputs.profiles)}} profile: ${{fromJSON(needs.prepare.outputs.profiles)}}
otp: otp:
- 24.0.5-emqx-1 - 24.1.1-emqx-1
steps: steps:
- uses: actions/download-artifact@v2 - uses: actions/download-artifact@v2
@ -400,7 +400,7 @@ jobs:
matrix: matrix:
otp: otp:
- 23.2.7.2-emqx-2 - 23.2.7.2-emqx-2
- 24.0.5-emqx-1 - 24.1.1-emqx-1
needs: [prepare, mac, linux, docker] needs: [prepare, mac, linux, docker]
steps: steps:
- uses: geekyeggo/delete-artifact@v1 - uses: geekyeggo/delete-artifact@v1
@ -418,7 +418,7 @@ jobs:
matrix: matrix:
profile: ${{fromJSON(needs.prepare.outputs.profiles)}} profile: ${{fromJSON(needs.prepare.outputs.profiles)}}
otp: otp:
- 24.0.5-emqx-1 - 24.1.1-emqx-1
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2

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

@ -16,7 +16,7 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
otp: otp:
- 24.0.5-emqx-1 - 24.1.1-emqx-1
os: os:
- ubuntu20.04 - ubuntu20.04
- centos7 - centos7
@ -62,7 +62,7 @@ jobs:
- macos-11 - macos-11
- macos-10.15 - macos-10.15
otp: otp:
- 24.0.5-emqx-1 - 24.1.1-emqx-1
runs-on: ${{ matrix.macos }} runs-on: ${{ matrix.macos }}

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: "ghcr.io/emqx/emqx-builder-helper/5.0:24.0.5-emqx-1-ubuntu20.04" container: "ghcr.io/emqx/emqx-builder-helper/5.0:24.1.1-emqx-1-ubuntu20.04"
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2

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

@ -13,7 +13,7 @@ jobs:
matrix: matrix:
otp: otp:
- "23.2.7.2-emqx-2" - "23.2.7.2-emqx-2"
- "24.0.5-emqx-1" - "24.1.1-emqx-1"
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
container: "ghcr.io/emqx/emqx-builder-helper/5.0:${{ matrix.otp }}-ubuntu20.04" container: "ghcr.io/emqx/emqx-builder-helper/5.0:${{ matrix.otp }}-ubuntu20.04"

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

@ -13,7 +13,7 @@ jobs:
matrix: matrix:
otp: otp:
- "23.2.7.2-emqx-2" - "23.2.7.2-emqx-2"
- "24.0.5-emqx-1" - "24.1.1-emqx-1"
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
container: "ghcr.io/emqx/emqx-builder-helper/5.0:${{ matrix.otp }}-ubuntu20.04" container: "ghcr.io/emqx/emqx-builder-helper/5.0:${{ matrix.otp }}-ubuntu20.04"

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

@ -13,7 +13,7 @@ jobs:
matrix: matrix:
otp: otp:
- "23.2.7.2-emqx-2" - "23.2.7.2-emqx-2"
- "24.0.5-emqx-1" - "24.1.1-emqx-1"
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
container: "ghcr.io/emqx/emqx-builder-helper/5.0:${{ matrix.otp }}-ubuntu20.04" container: "ghcr.io/emqx/emqx-builder-helper/5.0:${{ matrix.otp }}-ubuntu20.04"

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

@ -13,7 +13,7 @@ jobs:
matrix: matrix:
otp: otp:
- "23.2.7.2-emqx-2" - "23.2.7.2-emqx-2"
- "24.0.5-emqx-1" - "24.1.1-emqx-1"
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
container: "ghcr.io/emqx/emqx-builder-helper/5.0:${{ matrix.otp }}-ubuntu20.04" container: "ghcr.io/emqx/emqx-builder-helper/5.0:${{ matrix.otp }}-ubuntu20.04"
@ -36,7 +36,7 @@ jobs:
matrix: matrix:
otp: otp:
- "23.2.7.2-emqx-2" - "23.2.7.2-emqx-2"
- "24.0.5-emqx-1" - "24.1.1-emqx-1"
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
container: "ghcr.io/emqx/emqx-builder-helper/5.0:${{ matrix.otp }}-ubuntu20.04" container: "ghcr.io/emqx/emqx-builder-helper/5.0:${{ matrix.otp }}-ubuntu20.04"

2
deploy/docker/Dockerfile
View File

@ -1,4 +1,4 @@
ARG BUILD_FROM=ghcr.io/emqx/emqx-builder-helper/5.0:24.0.5-emqx-1-alpine3.14 ARG BUILD_FROM=ghcr.io/emqx/emqx-builder-helper/5.0:24.1.1-emqx-1-alpine3.14
ARG RUN_FROM=alpine:3.14 ARG RUN_FROM=alpine:3.14
FROM ${BUILD_FROM} AS builder FROM ${BUILD_FROM} AS builder