diff --git a/.github/actions/package-macos/action.yaml b/.github/actions/package-macos/action.yaml index 8615a433a..6b47ceafa 100644 --- a/.github/actions/package-macos/action.yaml +++ b/.github/actions/package-macos/action.yaml @@ -33,7 +33,6 @@ runs: HOMEBREW_NO_INSTALL_UPGRADE: 1 HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1 run: | - brew update brew install curl zip unzip coreutils openssl@1.1 echo "/usr/local/opt/bison/bin" >> $GITHUB_PATH echo "/usr/local/bin" >> $GITHUB_PATH diff --git a/.github/workflows/build_and_push_docker_images.yaml b/.github/workflows/build_and_push_docker_images.yaml index 3b47150c2..3ee9b79c7 100644 --- a/.github/workflows/build_and_push_docker_images.yaml +++ b/.github/workflows/build_and_push_docker_images.yaml @@ -182,6 +182,7 @@ jobs: images: | ${{ matrix.registry }}/${{ github.repository_owner }}/${{ matrix.profile }} flavor: | + latest=${{ matrix.elixir == 'no_elixir' }} suffix=${{ steps.pre-meta.outputs.img_suffix }} tags: | type=semver,pattern={{major}}.{{minor}},value=${{ needs.prepare.outputs.VERSION }} diff --git a/mix.exs b/mix.exs index 1e18ef8ef..1cdea809f 100644 --- a/mix.exs +++ b/mix.exs @@ -91,8 +91,7 @@ defmodule EMQXUmbrella.MixProject do {:cowlib, github: "ninenines/cowlib", ref: "c6553f8308a2ca5dcd69d845f0a7d098c40c3363", override: true}, # in conflict by cowboy_swagger and cowboy - {:ranch, - github: "emqx/ranch", ref: "de8ba2a00817c0a6eb1b8f20d6fb3e44e2c9a5aa", override: true}, + {:ranch, github: "emqx/ranch", tag: "1.8.1-emqx", override: true}, # in conflict by grpc and eetcd {:gpb, "4.19.7", override: true, runtime: false}, {:hackney, github: "emqx/hackney", tag: "1.18.1-1", override: true},