Просмотр исходного кода

Merge pull request #11205 from Rory-Z/ci/do-not-set-latest

ci: do not set latest for elixir image
JimMoen 2 лет назад
Родитель
Сommit
2795c3e18a

+ 0 - 1
.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

+ 1 - 0
.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 }}

+ 1 - 2
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},