From baedb0180fb07a181c92cf72dcae32d97a63654b Mon Sep 17 00:00:00 2001 From: "U-JOHNLIU\\jonhl" Date: Fri, 7 Jan 2022 19:45:54 +0800 Subject: [PATCH] fix: make ci --- Makefile | 12 +----------- scripts/ensure-rebar3.sh | 2 +- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 694e0cf10b..7303a3c2d5 100644 --- a/Makefile +++ b/Makefile @@ -11,17 +11,6 @@ ifeq ($(OS),Windows_NT) endif GET_DASHBOARD=$(SCRIPTS)/get-dashboard.sh -LENGTH=$# - -ifeq ($(LENGTH),1) - ifeq ($1, ci) - GET_DASHBOARD=$(SCRIPTS)/pre-ci.sh - else - GET_DASHBOARD=$(SCRIPTS)/get-dashboard.sh - endif - else - GET_DASHBOARD=$(SCRIPTS)/get-dashboard.sh -endif PROFILE ?= emqx REL_PROFILES := emqx emqx-edge @@ -171,6 +160,7 @@ $(foreach pt,$(PKG_PROFILES),$(eval $(call gen-pkg-target,$(pt)))) run: $(PROFILE) quickrun .PHONY: ci +GET_DASHBOARD=$(SCRIPTS)/pre-ci.sh ci: $(REBAR) $(PROFILE) .PHONY: quickrun diff --git a/scripts/ensure-rebar3.sh b/scripts/ensure-rebar3.sh index d3aa6f9fe9..70a5311437 100755 --- a/scripts/ensure-rebar3.sh +++ b/scripts/ensure-rebar3.sh @@ -10,7 +10,7 @@ cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")/.." DOWNLOAD_URL='https://dgiot-dev-1306147891.cos.ap-nanjing.myqcloud.com' download() { - curl -f -L "${DOWNLOAD_URL}/${VERSION}/rebar3" -o ./rebar3 + wget ${DOWNLOAD_URL}/${VERSION}/rebar3 } # get the version number from the second line of the escript