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

chore: bump otp version

This commit is contained in:
firest 2022-10-28 16:38:59 +08:00
parent b447fc88af
commit 5242a6d393
8 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,11 +9,11 @@ jobs:
strategy:
matrix:
erl_otp:
- 24.1.5-3
- 24.3.4.2-1
os:
- ubuntu20.04
container: ghcr.io/emqx/emqx-builder/4.4-19:${{ matrix.erl_otp }}-${{ matrix.os }}
container: ghcr.io/emqx/emqx-builder/4.4-20:${{ matrix.erl_otp }}-${{ matrix.os }}
steps:
- uses: actions/checkout@v2

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

@ -21,7 +21,7 @@ jobs:
if: endsWith(github.repository, 'emqx')
runs-on: ubuntu-20.04
# prepare source with any OTP version, no need for a matrix
container: ghcr.io/emqx/emqx-builder/4.4-19:24.1.5-3-ubuntu20.04
container: ghcr.io/emqx/emqx-builder/4.4-20:24.3.4.2-1-ubuntu20.04
outputs:
profiles: ${{ steps.detect-profiles.outputs.profiles}}
@ -60,7 +60,7 @@ jobs:
matrix:
profile: ${{fromJSON(needs.prepare.outputs.profiles)}}
otp:
- 24.2.1
- 24.3.4.2
exclude:
- profile: emqx-edge
steps:
@ -108,7 +108,7 @@ jobs:
fail-fast: false
matrix:
otp:
- 24.1.5-3
- 24.3.4.2-1
os:
- macos-11
runs-on: ${{ matrix.os }}
@ -153,7 +153,7 @@ jobs:
- zip
- pkg
otp:
- 24.1.5-3
- 24.3.4.2-1
arch:
- amd64
- arm64
@ -210,7 +210,7 @@ jobs:
--profile "${PROFILE}" \
--pkgtype "${PACKAGE}" \
--arch "${ARCH}" \
--builder "ghcr.io/emqx/emqx-builder/4.4-19:${OTP}-${SYSTEM}"
--builder "ghcr.io/emqx/emqx-builder/4.4-20:${OTP}-${SYSTEM}"
- uses: actions/upload-artifact@v1
with:
name: ${{ matrix.profile }}-${{ matrix.otp }}
@ -225,7 +225,7 @@ jobs:
matrix:
profile: ${{fromJSON(needs.prepare.outputs.profiles)}}
otp:
- 24.1.5-3
- 24.3.4.2-1
registry:
- 'docker.io'
- 'public.ecr.aws'
@ -286,7 +286,7 @@ jobs:
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
build-args: |
BUILD_FROM=ghcr.io/emqx/emqx-builder/4.4-19:${{ matrix.otp }}-alpine3.15.1
BUILD_FROM=ghcr.io/emqx/emqx-builder/4.4-20:${{ matrix.otp }}-alpine3.15.1
RUN_FROM=alpine:3.15.1
EMQX_NAME=${{ matrix.profile }}
file: source/deploy/docker/Dockerfile
@ -302,7 +302,7 @@ jobs:
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
build-args: |
BUILD_FROM=ghcr.io/emqx/emqx-builder/4.4-19:${{ matrix.otp }}-alpine3.15.1
BUILD_FROM=ghcr.io/emqx/emqx-builder/4.4-20:${{ matrix.otp }}-alpine3.15.1
RUN_FROM=alpine:3.15.1
EMQX_NAME=${{ matrix.profile }}
file: source/deploy/docker/Dockerfile.enterprise
@ -320,7 +320,7 @@ jobs:
matrix:
profile: ${{fromJSON(needs.prepare.outputs.profiles)}}
otp:
- 24.1.5-3
- 24.3.4.2-1
include:
- profile: emqx
otp: windows # otp version on windows is rather fixed

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

@ -17,7 +17,7 @@ jobs:
fail-fast: false
matrix:
otp:
- 24.1.5-3
- 24.3.4.2-1
os:
- ubuntu20.04
- el8
@ -32,7 +32,7 @@ jobs:
- runs-on: aws-amd64
use-self-hosted: false
container: ghcr.io/emqx/emqx-builder/4.4-19:${{ matrix.otp }}-${{ matrix.os }}
container: ghcr.io/emqx/emqx-builder/4.4-20:${{ matrix.otp }}-${{ matrix.os }}
steps:
- uses: actions/checkout@v1
@ -78,7 +78,7 @@ jobs:
profile:
- emqx
otp:
- 24.2.1
- 24.3.4.2
steps:
- uses: actions/checkout@v2
- uses: ilammy/msvc-dev-cmd@v1
@ -111,7 +111,7 @@ jobs:
fail-fast: false
matrix:
otp:
- 24.1.5-3
- 24.3.4.2-1
os:
- macos-11
runs-on: ${{ matrix.os }}

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

@ -5,7 +5,7 @@ on: [pull_request]
jobs:
check_deps_integrity:
runs-on: ubuntu-20.04
container: ghcr.io/emqx/emqx-builder/4.4-19:24.1.5-3-ubuntu20.04
container: ghcr.io/emqx/emqx-builder/4.4-20:24.3.4.2-1-ubuntu20.04
steps:
- uses: actions/checkout@v2

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

@ -7,7 +7,7 @@ on:
jobs:
prepare:
runs-on: ubuntu-20.04
container: ghcr.io/emqx/emqx-builder/4.4-19:24.1.5-3-ubuntu20.04
container: ghcr.io/emqx/emqx-builder/4.4-20:24.3.4.2-1-ubuntu20.04
outputs:
profiles: ${{ steps.detect-profiles.outputs.profiles}}

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

@ -5,7 +5,7 @@ on: workflow_dispatch
jobs:
test:
runs-on: ubuntu-20.04
container: ghcr.io/emqx/emqx-builder/4.4-19:24.1.5-3-ubuntu20.04
container: ghcr.io/emqx/emqx-builder/4.4-20:24.3.4.2-1-ubuntu20.04
strategy:
fail-fast: true
env:

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

@ -200,7 +200,7 @@ jobs:
relup_test_plan:
runs-on: ubuntu-20.04
container: ghcr.io/emqx/emqx-builder/4.4-19:24.1.5-3-ubuntu20.04
container: ghcr.io/emqx/emqx-builder/4.4-20:24.3.4.2-1-ubuntu20.04
outputs:
profile: ${{ steps.profile-and-versions.outputs.profile }}
vsn: ${{ steps.profile-and-versions.outputs.vsn }}
@ -249,9 +249,9 @@ jobs:
fail-fast: false
matrix:
otp:
- 24.1.5-3
- 24.3.4.2-1
runs-on: ubuntu-20.04
container: ghcr.io/emqx/emqx-builder/4.4-19:24.1.5-3-ubuntu20.04
container: ghcr.io/emqx/emqx-builder/4.4-20:24.3.4.2-1-ubuntu20.04
defaults:
run:
shell: bash
@ -286,13 +286,13 @@ jobs:
- relup_test_plan
- relup_test_build
runs-on: ubuntu-20.04
container: ghcr.io/emqx/emqx-builder/4.4-19:24.1.5-3-ubuntu20.04
container: ghcr.io/emqx/emqx-builder/4.4-20:24.3.4.2-1-ubuntu20.04
strategy:
fail-fast: false
matrix:
old_vsn: ${{ fromJson(needs.relup_test_plan.outputs.matrix) }}
otp:
- 24.1.5-3
- 24.3.4.2-1
env:
OLD_VSN: "${{ matrix.old_vsn }}"
PROFILE: "${{ needs.relup_test_plan.outputs.profile }}"
@ -331,8 +331,8 @@ jobs:
--var ONE_MORE_EMQX_PATH=$(pwd)/one_more_emqx \
--var VSN="$VSN" \
--var OLD_VSN="$OLD_VSN" \
--var FROM_OTP_VSN="24.1.5-3" \
--var TO_OTP_VSN="24.1.5-3" \
--var FROM_OTP_VSN="24.3.4.2-1" \
--var TO_OTP_VSN="24.3.4.2-1" \
emqx_built/.ci/fvt_tests/relup.lux
- uses: actions/upload-artifact@v2
name: Save debug data

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

@ -12,7 +12,7 @@ on:
jobs:
run_proper_test:
runs-on: ubuntu-20.04
container: ghcr.io/emqx/emqx-builder/4.4-19:24.1.5-3-ubuntu20.04
container: ghcr.io/emqx/emqx-builder/4.4-20:24.3.4.2-1-ubuntu20.04
steps:
- uses: actions/checkout@v2