From 554c4b4c3bd597682836a35c6a6bff553ede372d Mon Sep 17 00:00:00 2001 From: Ivan Dyachkov Date: Thu, 27 Oct 2022 19:04:13 +0200 Subject: [PATCH 1/2] build: stop trying to fetch rebar and build deps on each build --- .gitignore | 1 + Makefile | 11 +++++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index d8b3806e3..d01c764d0 100644 --- a/.gitignore +++ b/.gitignore @@ -68,3 +68,4 @@ apps/emqx/test/emqx_static_checks_data/master.bpapi # rendered configurations *.conf.rendered lux_logs/ +/.prepare diff --git a/Makefile b/Makefile index eeabaed33..e9238d098 100644 --- a/Makefile +++ b/Makefile @@ -30,12 +30,10 @@ export REBAR_GIT_CLONE_OPTIONS += --depth=1 .PHONY: default default: $(REBAR) $(PROFILE) -.PHONY: prepare -prepare: FORCE +.prepare: @$(SCRIPTS)/git-hooks-init.sh # this is no longer needed since 5.0 but we keep it anyway @$(SCRIPTS)/prepare-build-deps.sh - -FORCE: + @touch .prepare .PHONY: all all: $(REBAR) $(PROFILES) @@ -44,6 +42,9 @@ all: $(REBAR) $(PROFILES) ensure-rebar3: @$(SCRIPTS)/ensure-rebar3.sh +$(REBAR): .prepare + @$(SCRIPTS)/ensure-rebar3.sh + .PHONY: ensure-hex ensure-hex: @mix local.hex --if-missing --force @@ -60,8 +61,6 @@ ensure-mix-rebar: $(REBAR) mix-deps-get: $(ELIXIR_COMMON_DEPS) @mix deps.get -$(REBAR): prepare ensure-rebar3 - .PHONY: eunit eunit: $(REBAR) conf-segs @ENABLE_COVER_COMPILE=1 $(REBAR) eunit -v -c --cover_export_name $(PROFILE)-eunit From dcab22458d2eeb50a683683c9e0023dfcb57ae9a Mon Sep 17 00:00:00 2001 From: Ivan Dyachkov Date: Thu, 27 Oct 2022 19:41:57 +0200 Subject: [PATCH 2/2] build: always ensure rebar3 --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e9238d098..7644e1e2a 100644 --- a/Makefile +++ b/Makefile @@ -42,8 +42,7 @@ all: $(REBAR) $(PROFILES) ensure-rebar3: @$(SCRIPTS)/ensure-rebar3.sh -$(REBAR): .prepare - @$(SCRIPTS)/ensure-rebar3.sh +$(REBAR): .prepare ensure-rebar3 .PHONY: ensure-hex ensure-hex: