diff --git a/.github/workflows/spelling.yml b/.github/workflows/spelling.yml index f6da5ad65..c7d4629e5 100644 --- a/.github/workflows/spelling.yml +++ b/.github/workflows/spelling.yml @@ -17,7 +17,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/download-artifact@v2 with: - name: emqx-24.1.5-4-ubuntu20.04 + name: emqx-24.2.1-1-ubuntu20.04 workflow: build_slim_packages.yaml path: . - name: Run spellcheck diff --git a/mix.exs b/mix.exs index df0d0f3a3..6c0d52989 100644 --- a/mix.exs +++ b/mix.exs @@ -511,7 +511,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.2/Mix.Release.html#__struct__/0 + # See: https://hexdocs.pm/mix/1.13.3/Mix.Release.html#__struct__/0 defp prepare_tar_overlays(release) do Map.update!( release, diff --git a/scripts/buildx.sh b/scripts/buildx.sh index afbd2ca63..a6604ed0a 100755 --- a/scripts/buildx.sh +++ b/scripts/buildx.sh @@ -8,7 +8,8 @@ ## i.e. will not work if docker command has to be executed with sudo ## example: -## ./scripts/buildx.sh --profile emqx --pkgtype tgz --arch arm64 --builder ghcr.io/emqx/emqx-builder/4.4-4:24.1.5-3-debian10 +## ./scripts/buildx.sh --profile emqx --pkgtype tgz --arch arm64 \ +## --builder ghcr.io/emqx/emqx-builder/5.0-7:1.13.3-24.2.1-1-debian10 set -euo pipefail @@ -23,7 +24,7 @@ help() { echo "--arch amd64|arm64: Target arch to build the EMQX package for" echo "--src_dir : EMQX source ode in this dir, default to PWD" echo "--builder : Builder image to pull" - echo " E.g. ghcr.io/emqx/emqx-builder/4.4-4:24.1.5-3-debian10" + echo " E.g. ghcr.io/emqx/emqx-builder/5.0-7:1.13.3=24.2.1-1-debian10" echo "--otp : OTP version being used in the builder" echo "--elixir : Elixir version being used in the builder" echo "--system : OS used in the builder image" diff --git a/scripts/update_appup.escript b/scripts/update_appup.escript index e4e55f23c..f2b6235e9 100755 --- a/scripts/update_appup.escript +++ b/scripts/update_appup.escript @@ -33,7 +33,7 @@ Options: --release-dir Release directory --src-dirs Directories where source code is found. Defaults to '{src,apps,lib-*}/**/' --binary-rel-url Binary release URL pattern. %VSN% variable is substituted with the version in release tag. - E.g. \"https://github.com/emqx/emqx/releases/download/v%VSN%/emqx-%VSN%-otp-24.1.5-3-el7-amd64.tar.gz\" + E.g. \"https://github.com/emqx/emqx/releases/download/v%VSN%/emqx-%VSN%-otp-24.2.1-1-el7-amd64.tar.gz\" ". -record(app,