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

ci: update OTP version

This commit is contained in:
Zaiming (Stone) Shi 2022-08-17 16:26:36 +02:00
parent 71610b01c6
commit 10cabddb07
13 changed files with 18 additions and 18 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-3-ubuntu20.04 ARG BUILD_FROM=emqx/build-env:erl23.3.4.9-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-3-ubuntu20.04 image: emqx/build-env:erl23.3.4.9-3-ubuntu20.04
env_file: env_file:
- conf.env - conf.env
environment: environment:

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

@ -9,7 +9,7 @@ jobs:
strategy: strategy:
matrix: matrix:
erl_otp: erl_otp:
- erl23.2.7.2-emqx-3 - erl23.3.4.9-3
os: os:
- ubuntu20.04 - ubuntu20.04

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

@ -18,7 +18,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-3-ubuntu20.04 container: emqx/build-env:erl23.3.4.9-3-ubuntu20.04
outputs: outputs:
profiles: ${{ steps.set_profile.outputs.profiles}} profiles: ${{ steps.set_profile.outputs.profiles}}
@ -125,7 +125,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-3 - 23.3.4.9-3
exclude: exclude:
- profile: emqx-edge - profile: emqx-edge
macos: macos:

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

@ -11,7 +11,7 @@ jobs:
strategy: strategy:
matrix: matrix:
erl_otp: erl_otp:
- erl23.2.7.2-emqx-3 - erl23.3.4.9-3
os: os:
- ubuntu20.04 - ubuntu20.04
- centos7 - centos7
@ -55,7 +55,7 @@ jobs:
strategy: strategy:
matrix: matrix:
erl_otp: erl_otp:
- 23.2.7.2-emqx-3 - 23.3.4.9-3
macos: macos:
- macos-11 - macos-11
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: emqx/build-env:erl23.2.7.2-emqx-3-ubuntu20.04 container: emqx/build-env:erl23.3.4.9-3-ubuntu20.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2

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

@ -7,7 +7,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-3-ubuntu20.04 container: emqx/build-env:erl23.3.4.9-3-ubuntu20.04
outputs: outputs:
profiles: ${{ steps.set_profile.outputs.profiles}} profiles: ${{ steps.set_profile.outputs.profiles}}

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-3-ubuntu20.04 container: emqx/build-env:erl23.3.4.9-3-ubuntu20.04
strategy: strategy:
fail-fast: true fail-fast: true
env: env:

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

@ -15,7 +15,7 @@ jobs:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- uses: erlef/setup-beam@v1 - uses: erlef/setup-beam@v1
with: with:
otp-version: "23.2" otp-version: "23.3.4.9"
- name: make docker - name: make docker
run: | run: |
if make emqx-ee --dry-run > /dev/null 2>&1; then if make emqx-ee --dry-run > /dev/null 2>&1; then
@ -67,7 +67,7 @@ jobs:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- uses: erlef/setup-beam@v1 - uses: erlef/setup-beam@v1
with: with:
otp-version: "23.2" otp-version: "23.3.4.9"
- 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
@ -176,7 +176,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-3-ubuntu20.04 container: emqx/build-env:erl23.3.4.9-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 }}
@ -222,7 +222,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-3-ubuntu20.04 container: emqx/build-env:erl23.3.4.9-3-ubuntu20.04
defaults: defaults:
run: run:
shell: bash shell: bash

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

@ -10,7 +10,7 @@ on:
jobs: 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-3-ubuntu20.04 container: emqx/build-env:erl23.3.4.9-3-ubuntu20.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2

2
.tool-versions
View File

@ -1 +1 @@
erlang 23.2.7.2-emqx-3 erlang 23.3.4.9-3

2
Makefile
View File

@ -4,7 +4,7 @@ REBAR = $(CURDIR)/rebar3
BUILD = $(CURDIR)/build BUILD = $(CURDIR)/build
SCRIPTS = $(CURDIR)/scripts SCRIPTS = $(CURDIR)/scripts
export EMQX_RELUP ?= true export EMQX_RELUP ?= true
export EMQX_DEFAULT_BUILDER = emqx/build-env:erl23.2.7.2-emqx-3-alpine export EMQX_DEFAULT_BUILDER = emqx/build-env:erl23.3.4.9-3-alpine
export EMQX_DEFAULT_RUNNER = alpine:3.12 export EMQX_DEFAULT_RUNNER = alpine:3.12
export PKG_VSN ?= $(shell $(CURDIR)/pkg-vsn.sh) export PKG_VSN ?= $(shell $(CURDIR)/pkg-vsn.sh)
export DOCKERFILE := deploy/docker/Dockerfile export DOCKERFILE := deploy/docker/Dockerfile

2
Windows.md
View File

@ -29,7 +29,7 @@ The second path is for CMD to setup environment variables.
### Erlang/OTP ### Erlang/OTP
Install Erlang/OTP 23.2 from https://www.erlang.org/downloads Install Erlang/OTP 23.3 from https://www.erlang.org/downloads
You may need to edit the `Path` environment variable to allow running You may need to edit the `Path` environment variable to allow running
Erlang commands such as `erl` from CMD. Erlang commands such as `erl` from CMD.