diff --git a/.ci/docker-compose-file/docker-compose.yaml b/.ci/docker-compose-file/docker-compose.yaml index ea2de3356..55d6fc145 100644 --- a/.ci/docker-compose-file/docker-compose.yaml +++ b/.ci/docker-compose-file/docker-compose.yaml @@ -3,7 +3,7 @@ version: '3.9' services: erlang23: container_name: erlang23 - image: ghcr.io/emqx/emqx-builder/5.0-4:1.13.1-23.3.4.9-3-ubuntu20.04 + image: ghcr.io/emqx/emqx-builder/5.0-5:1.13.2-23.3.4.9-4-ubuntu20.04 env_file: - conf.env environment: @@ -23,7 +23,7 @@ services: erlang24: container_name: erlang24 - image: ghcr.io/emqx/emqx-builder/5.0-4:1.13.1-24.1.5-3-ubuntu20.04 + image: ghcr.io/emqx/emqx-builder/5.0-5:1.13.2-24.1.5-4-ubuntu20.04 env_file: - conf.env environment: diff --git a/.github/workflows/build_packages.yaml b/.github/workflows/build_packages.yaml index a05ecae46..3809dd776 100644 --- a/.github/workflows/build_packages.yaml +++ b/.github/workflows/build_packages.yaml @@ -19,7 +19,7 @@ jobs: prepare: runs-on: ubuntu-20.04 # prepare source with any OTP version, no need for a matrix - container: "ghcr.io/emqx/emqx-builder/5.0-4:1.13.1-24.1.5-3-ubuntu20.04" + container: "ghcr.io/emqx/emqx-builder/5.0-5:1.13.2-24.1.5-4-ubuntu20.04" outputs: ce_old_vsns: ${{ steps.find_old_versons.outputs.ce_old_vsns }} @@ -130,7 +130,7 @@ jobs: - emqx - emqx-enterprise otp: - - 24.1.5-3 + - 24.1.5-4 macos: - macos-11 - macos-10.15 @@ -236,9 +236,9 @@ jobs: - emqx - emqx-enterprise otp: - - 24.1.5-3 # we test with OTP 23, but only build package on OTP 24 versions + - 24.1.5-4 # we test with OTP 23, but only build package on OTP 24 versions elixir: - - 1.13.1 + - 1.13.2 # used to split elixir packages into a separate job, since the # entire job may take a lot of time, especially on arm64 # emulation. @@ -277,14 +277,14 @@ jobs: profile: emqx-enterprise include: - profile: emqx - otp: 24.1.5-3 - elixir: 1.13.1 + otp: 24.1.5-4 + elixir: 1.13.2 arch: amd64 build_elixir: with_elixir os: ubuntu20.04 - profile: emqx - otp: 24.1.5-3 - elixir: 1.13.1 + otp: 24.1.5-4 + elixir: 1.13.2 arch: amd64 build_elixir: with_elixir os: centos8 @@ -376,7 +376,7 @@ jobs: --otp "${OTP}" \ --elixir "${ELIXIR}" \ --system "${SYSTEM}" \ - --builder "ghcr.io/emqx/emqx-builder/5.0-4:${ELIXIR}-${OTP}-${SYSTEM}" + --builder "ghcr.io/emqx/emqx-builder/5.0-5:${ELIXIR}-${OTP}-${SYSTEM}" ## the pkg build is incremental on the tgz build ./scripts/buildx.sh \ --profile "${PROFILE}" \ @@ -385,7 +385,7 @@ jobs: --otp "${OTP}" \ --elixir "${ELIXIR}" \ --system "${SYSTEM}" \ - --builder "ghcr.io/emqx/emqx-builder/5.0-4:${ELIXIR}-${OTP}-${SYSTEM}" + --builder "ghcr.io/emqx/emqx-builder/5.0-5:${ELIXIR}-${OTP}-${SYSTEM}" - name: build emqx packages (Elixir) env: @@ -406,7 +406,7 @@ jobs: --elixir "${ELIXIR}" \ --system "${SYSTEM}" \ --with-elixir \ - --builder "ghcr.io/emqx/emqx-builder/5.0-4:${ELIXIR}-${OTP}-${SYSTEM}" + --builder "ghcr.io/emqx/emqx-builder/5.0-5:${ELIXIR}-${OTP}-${SYSTEM}" - name: create sha256 env: @@ -440,9 +440,9 @@ jobs: # NOTE: for docker, only support latest otp and elixir # versions, not a matrix otp: - - 24.1.5-3 # update to latest + - 24.1.5-4 # update to latest elixir: - - 1.13.1 # update to latest + - 1.13.2 # update to latest arch: - amd64 - arm64 @@ -450,8 +450,8 @@ jobs: - no_elixir include: - profile: emqx - otp: 24.1.5-3 - elixir: 1.13.1 + otp: 24.1.5-4 + elixir: 1.13.2 arch: amd64 build_elixir: with_elixir @@ -513,7 +513,7 @@ jobs: tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} build-args: | - BUILD_FROM=ghcr.io/emqx/emqx-builder/5.0-4:${{ matrix.elixir }}-${{ matrix.otp }}-alpine3.14 + BUILD_FROM=ghcr.io/emqx/emqx-builder/5.0-5:${{ matrix.elixir }}-${{ matrix.otp }}-alpine3.14 RUN_FROM=alpine:3.14 EMQX_NAME=${{ matrix.profile }} file: source/deploy/docker/Dockerfile @@ -529,7 +529,7 @@ jobs: tags: ${{ steps.meta-elixir.outputs.tags }} labels: ${{ steps.meta-elixir.outputs.labels }} build-args: | - BUILD_FROM=ghcr.io/emqx/emqx-builder/5.0-4:${{ matrix.elixir }}-${{ matrix.otp }}-alpine3.14 + BUILD_FROM=ghcr.io/emqx/emqx-builder/5.0-5:${{ matrix.elixir }}-${{ matrix.otp }}-alpine3.14 RUN_FROM=alpine:3.14 EMQX_NAME=emqx-elixir file: source/deploy/docker/Dockerfile @@ -579,7 +579,7 @@ jobs: - emqx - emqx-enterprise otp: - - 24.1.5-3 + - 24.1.5-4 steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/build_slim_packages.yaml b/.github/workflows/build_slim_packages.yaml index b126d65a7..a17940354 100644 --- a/.github/workflows/build_slim_packages.yaml +++ b/.github/workflows/build_slim_packages.yaml @@ -34,14 +34,14 @@ jobs: - emqx - emqx-enterprise otp: - - 24.1.5-3 + - 24.1.5-4 elixir: - - 1.13.1 + - 1.13.2 os: - ubuntu20.04 - centos7 - container: "ghcr.io/emqx/emqx-builder/5.0-4:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}" + container: "ghcr.io/emqx/emqx-builder/5.0-5:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}" steps: - uses: actions/checkout@v1 @@ -102,7 +102,7 @@ jobs: - emqx - emqx-enterprise otp: - - 24.1.5-3 + - 24.1.5-4 macos: - macos-11 - macos-10.15 diff --git a/.github/workflows/check_deps_integrity.yaml b/.github/workflows/check_deps_integrity.yaml index 60bd4aac3..26143b807 100644 --- a/.github/workflows/check_deps_integrity.yaml +++ b/.github/workflows/check_deps_integrity.yaml @@ -5,7 +5,7 @@ on: [pull_request] jobs: check_deps_integrity: runs-on: ubuntu-20.04 - container: ghcr.io/emqx/emqx-builder/5.0-4:1.13.1-23.3.4.9-3-ubuntu20.04 + container: ghcr.io/emqx/emqx-builder/5.0-5:1.13.2-24.1.5-4-ubuntu20.04 steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/elixir_apps_check.yaml b/.github/workflows/elixir_apps_check.yaml index 04bc8c024..617733207 100644 --- a/.github/workflows/elixir_apps_check.yaml +++ b/.github/workflows/elixir_apps_check.yaml @@ -7,7 +7,7 @@ on: [pull_request] jobs: elixir_apps_check: runs-on: ubuntu-20.04 - container: hexpm/elixir:1.13.1-erlang-24.2-alpine-3.15.0 + container: hexpm/elixir:1.13.2-erlang-24.2-alpine-3.15.0 strategy: fail-fast: false diff --git a/.github/workflows/elixir_deps_check.yaml b/.github/workflows/elixir_deps_check.yaml index 58721006a..b44275635 100644 --- a/.github/workflows/elixir_deps_check.yaml +++ b/.github/workflows/elixir_deps_check.yaml @@ -7,7 +7,7 @@ on: [pull_request] jobs: elixir_deps_check: runs-on: ubuntu-20.04 - container: ghcr.io/emqx/emqx-builder/5.0-4:1.13.1-24.1.5-3-ubuntu20.04 + container: ghcr.io/emqx/emqx-builder/5.0-5:1.13.2-24.1.5-4-ubuntu20.04 steps: - name: Checkout diff --git a/.github/workflows/elixir_release.yml b/.github/workflows/elixir_release.yml index 706013614..0fa97884d 100644 --- a/.github/workflows/elixir_release.yml +++ b/.github/workflows/elixir_release.yml @@ -12,7 +12,7 @@ on: jobs: build: runs-on: ubuntu-latest - container: ghcr.io/emqx/emqx-builder/5.0-4:1.13.1-24.1.5-3-ubuntu20.04 + container: ghcr.io/emqx/emqx-builder/5.0-5:1.13.2-24.1.5-4-ubuntu20.04 steps: - name: Checkout diff --git a/.github/workflows/run_api_tests.yaml b/.github/workflows/run_api_tests.yaml index 31093b67b..ff42eda2b 100644 --- a/.github/workflows/run_api_tests.yaml +++ b/.github/workflows/run_api_tests.yaml @@ -16,15 +16,15 @@ jobs: strategy: matrix: otp: - - 24.1.5-3 + - 24.1.5-4 elixir: - - 1.13.1 + - 1.13.2 os: - ubuntu20.04 arch: - amd64 runs-on: ubuntu-latest - container: ghcr.io/emqx/emqx-builder/5.0-4:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }} + container: ghcr.io/emqx/emqx-builder/5.0-5:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }} steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/run_emqx_app_tests.yaml b/.github/workflows/run_emqx_app_tests.yaml index 77e753483..7dd19b2a7 100644 --- a/.github/workflows/run_emqx_app_tests.yaml +++ b/.github/workflows/run_emqx_app_tests.yaml @@ -12,20 +12,20 @@ jobs: strategy: matrix: otp: - - 23.3.4.9-3 - - 24.1.5-3 + - 23.3.4.9-4 + - 24.1.5-4 # no need to use more than 1 version of Elixir, since tests # run using only Erlang code. This is needed just to specify # the base image. elixir: - - 1.13.1 + - 1.13.2 os: - ubuntu20.04 arch: - amd64 runs-on: ubuntu-20.04 - container: "ghcr.io/emqx/emqx-builder/5.0-4:${{ matrix.elixir}}-${{ matrix.otp }}-${{ matrix.os }}" + container: "ghcr.io/emqx/emqx-builder/5.0-5:${{ matrix.elixir}}-${{ matrix.otp }}-${{ matrix.os }}" steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/run_fvt_tests.yaml b/.github/workflows/run_fvt_tests.yaml index acacd6eef..17a77965f 100644 --- a/.github/workflows/run_fvt_tests.yaml +++ b/.github/workflows/run_fvt_tests.yaml @@ -14,7 +14,7 @@ jobs: prepare: runs-on: ubuntu-20.04 # prepare source with any OTP version, no need for a matrix - container: ghcr.io/emqx/emqx-builder/5.0-4:1.13.1-24.1.5-3-alpine3.14 + container: ghcr.io/emqx/emqx-builder/5.0-5:1.13.2-24.1.5-4-alpine3.14 steps: - uses: actions/checkout@v2 @@ -48,9 +48,9 @@ jobs: os: - alpine3.14 otp: - - 24.1.5-3 + - 24.1.5-4 elixir: - - 1.13.1 + - 1.13.2 arch: - amd64 exclude: @@ -85,7 +85,7 @@ jobs: - name: make docker image working-directory: source env: - EMQX_BUILDER: ghcr.io/emqx/emqx-builder/5.0-4:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }} + EMQX_BUILDER: ghcr.io/emqx/emqx-builder/5.0-5:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }} run: | make ${{ matrix.profile }}-docker - name: run emqx @@ -125,9 +125,9 @@ jobs: os: - alpine3.14 otp: - - 24.1.5-3 + - 24.1.5-4 elixir: - - 1.13.1 + - 1.13.2 arch: - amd64 # - emqx-enterprise # TODO test enterprise @@ -161,7 +161,7 @@ jobs: - name: make docker image working-directory: source env: - EMQX_BUILDER: ghcr.io/emqx/emqx-builder/5.0-4:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }} + EMQX_BUILDER: ghcr.io/emqx/emqx-builder/5.0-5:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }} run: | make ${{ matrix.profile }}-docker echo "TARGET=emqx/${{ matrix.profile }}" >> $GITHUB_ENV diff --git a/.github/workflows/run_relup_tests.yaml b/.github/workflows/run_relup_tests.yaml index 7bace05de..906a5e802 100644 --- a/.github/workflows/run_relup_tests.yaml +++ b/.github/workflows/run_relup_tests.yaml @@ -19,19 +19,19 @@ jobs: - emqx - emqx-enterprise otp: - - 24.1.5-3 + - 24.1.5-4 # no need to use more than 1 version of Elixir, since tests # run using only Erlang code. This is needed just to specify # the base image. elixir: - - 1.13.1 + - 1.13.2 os: - ubuntu20.04 arch: - amd64 runs-on: ubuntu-20.04 - container: "ghcr.io/emqx/emqx-builder/5.0-4:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}" + container: "ghcr.io/emqx/emqx-builder/5.0-5:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}" defaults: run: diff --git a/.github/workflows/run_test_cases.yaml b/.github/workflows/run_test_cases.yaml index 16ccf8497..e7bc5dafa 100644 --- a/.github/workflows/run_test_cases.yaml +++ b/.github/workflows/run_test_cases.yaml @@ -16,16 +16,16 @@ jobs: strategy: matrix: otp: - - 24.1.5-3 + - 24.1.5-4 elixir: - - 1.13.1 + - 1.13.2 os: - ubuntu20.04 arch: - amd64 runs-on: ubuntu-20.04 - container: "ghcr.io/emqx/emqx-builder/5.0-4:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}" + container: "ghcr.io/emqx/emqx-builder/5.0-5:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}" steps: - uses: actions/checkout@v2 diff --git a/.tool-versions b/.tool-versions index 1c687075b..54954aec2 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,2 +1,2 @@ -erlang 24.1.5-3 -elixir 1.13.1-otp-24 +erlang 24.1.5-4 +elixir 1.13.2-otp-24 diff --git a/Makefile b/Makefile index 55f43483b..d26a09e1b 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ REBAR_VERSION = 3.16.1-emqx-1 REBAR = $(CURDIR)/rebar3 BUILD = $(CURDIR)/build SCRIPTS = $(CURDIR)/scripts -export EMQX_DEFAULT_BUILDER = ghcr.io/emqx/emqx-builder/5.0-4:1.13.1-24.1.5-3-alpine3.14 +export EMQX_DEFAULT_BUILDER = ghcr.io/emqx/emqx-builder/5.0-5:1.13.2-24.1.5-4-alpine3.14 export EMQX_DEFAULT_RUNNER = alpine:3.14 export OTP_VSN ?= $(shell $(CURDIR)/scripts/get-otp-vsn.sh) export ELIXIR_VSN ?= $(shell $(CURDIR)/scripts/get-elixir-vsn.sh) diff --git a/deploy/docker/Dockerfile b/deploy/docker/Dockerfile index e4abad035..68463fa5e 100644 --- a/deploy/docker/Dockerfile +++ b/deploy/docker/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=ghcr.io/emqx/emqx-builder/5.0-4:1.13.1-24.1.5-3-alpine3.14 +ARG BUILD_FROM=ghcr.io/emqx/emqx-builder/5.0-5:1.13.2-24.1.5-4-alpine3.14 ARG RUN_FROM=alpine:3.14 FROM ${BUILD_FROM} AS builder diff --git a/mix.exs b/mix.exs index 9acdd2b92..07751dac3 100644 --- a/mix.exs +++ b/mix.exs @@ -24,13 +24,6 @@ defmodule EMQXUmbrella.MixProject do Defaults to `community`. """ - # Temporary hack while 1.13.2 is not released - System.version() - |> Version.parse!() - |> Version.compare(Version.parse!("1.13.2")) - |> Kernel.==(:lt) - |> if(do: Code.require_file("lib/mix/release.exs")) - def project() do [ app: :emqx_mix, @@ -425,7 +418,7 @@ defmodule EMQXUmbrella.MixProject do # The `:tar` built-in step in Mix Release does not currently add the # `etc` directory into the resulting tarball. The workaround is to # add those to the `:overlays` key before running `:tar`. - # See: https://hexdocs.pm/mix/1.13.1/Mix.Release.html#__struct__/0 + # See: https://hexdocs.pm/mix/1.13.2/Mix.Release.html#__struct__/0 defp prepare_tar_overlays(release) do Map.update!(release, :overlays, &["etc", "data" | &1]) end