diff --git a/.github/workflows/_pr_entrypoint.yaml b/.github/workflows/_pr_entrypoint.yaml index b56c958a6..3b8b1a0cd 100644 --- a/.github/workflows/_pr_entrypoint.yaml +++ b/.github/workflows/_pr_entrypoint.yaml @@ -78,7 +78,8 @@ jobs: MIX_ENV: emqx-enterprise PROFILE: emqx-enterprise run: | - mix local.hex --force --if-missing && mix local.rebar --force --if-missing + # mix local.hex --force --if-missing && mix local.rebar --force --if-missing + mix local.hex 2.0.6 --force --if-missing && mix local.rebar --force --if-missing - name: Check formatting env: MIX_ENV: emqx-enterprise diff --git a/.github/workflows/check_deps_integrity.yaml b/.github/workflows/check_deps_integrity.yaml index d5584ecb5..498934934 100644 --- a/.github/workflows/check_deps_integrity.yaml +++ b/.github/workflows/check_deps_integrity.yaml @@ -28,7 +28,8 @@ jobs: - run: ./scripts/check-deps-integrity.escript - name: Setup mix run: | - mix local.hex --force + # mix local.hex --force + mix local.hex 2.0.6 --force mix local.rebar --force mix deps.get - name: print mix dependency tree diff --git a/Makefile b/Makefile index 8c9c7957b..5b458d239 100644 --- a/Makefile +++ b/Makefile @@ -53,7 +53,8 @@ $(REBAR): .prepare ensure-rebar3 .PHONY: ensure-hex ensure-hex: - @mix local.hex --if-missing --force + # @mix local.hex --if-missing --force + @mix local.hex 2.0.6 --if-missing --force .PHONY: ensure-mix-rebar3 ensure-mix-rebar3: $(REBAR) diff --git a/build b/build index b8deeaa73..54f5e4db2 100755 --- a/build +++ b/build @@ -185,7 +185,8 @@ just_compile_elixir() { rm -f rebar.lock env MIX_ENV="$PROFILE" mix local.rebar --if-missing --force env MIX_ENV="$PROFILE" mix local.rebar rebar3 "${PWD}/rebar3" --if-missing --force - env MIX_ENV="$PROFILE" mix local.hex --if-missing --force + # env MIX_ENV="$PROFILE" mix local.hex --if-missing --force + env MIX_ENV="$PROFILE" mix local.hex 2.0.6 --if-missing --force env MIX_ENV="$PROFILE" mix deps.get env MIX_ENV="$PROFILE" mix compile } @@ -203,7 +204,8 @@ make_elixir_rel() { export_elixir_release_vars "$PROFILE" env MIX_ENV="$PROFILE" mix local.rebar --if-missing --force env MIX_ENV="$PROFILE" mix local.rebar rebar3 "${PWD}/rebar3" --if-missing --force - env MIX_ENV="$PROFILE" mix local.hex --if-missing --force + # env MIX_ENV="$PROFILE" mix local.hex --if-missing --force + env MIX_ENV="$PROFILE" mix local.hex 2.0.6 --if-missing --force env MIX_ENV="$PROFILE" mix deps.get env MIX_ENV="$PROFILE" mix release --overwrite assert_no_excluded_deps emqx-enterprise emqx_telemetry diff --git a/mix.exs b/mix.exs index 621b327b4..f3e91096e 100644 --- a/mix.exs +++ b/mix.exs @@ -102,7 +102,8 @@ defmodule EMQXUmbrella.MixProject do {:uuid, github: "okeuday/uuid", tag: "v2.0.6", override: true}, {:quickrand, github: "okeuday/quickrand", tag: "v2.0.6", override: true}, {:ra, "2.7.3", override: true}, - {:mimerl, "1.2.0", override: true} + {:mimerl, "1.2.0", override: true}, + {:supervisor3, "1.1.12", override: true} ] ++ emqx_apps(profile_info, version) ++ enterprise_deps(profile_info) ++ jq_dep() ++ quicer_dep() @@ -215,7 +216,6 @@ defmodule EMQXUmbrella.MixProject do {:brod, github: "kafka4beam/brod", tag: "3.16.8"}, {:snappyer, "1.2.9", override: true}, {:crc32cer, "0.1.8", override: true}, - {:supervisor3, "1.1.12", override: true}, {:opentsdb, github: "emqx/opentsdb-client-erl", tag: "v0.5.1", override: true}, {:greptimedb, github: "GreptimeTeam/greptimedb-ingester-erl", tag: "v0.1.8", override: true},