fix: make ci

ATM3069 · Jan 7, 2022 · baedb01 · baedb01
1 parent a3223c8
commit baedb01
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
diff --git 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
@@ -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