From c2353b42ff5b5113e0ac678427015b9621c46376 Mon Sep 17 00:00:00 2001 From: Colin Hutchinson Date: Wed, 1 Apr 2020 14:38:36 +0000 Subject: [PATCH] chore(ci) adjust how we cleanup / setup the builds to fix arm --- Makefile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 7d75f74c..2645b351 100644 --- a/Makefile +++ b/Makefile @@ -102,15 +102,13 @@ debug: @echo ${DEBUG} setup-ci: -ifneq ($(RESTY_IMAGE_BASE),src) - .ci/setup_ci.sh - $(MAKE) setup-build -endif + @echo "no longer used" setup-build: cleanup-build ifeq ($(RESTY_IMAGE_BASE),src) @echo "nothing to be done" else ifeq ($(BUILDX),true) + .ci/setup_ci.sh docker buildx create --name multibuilder docker-machine create --driver amazonec2 \ --amazonec2-instance-type a1.medium \ @@ -189,7 +187,7 @@ else package-kong: actual-package-kong endif -actual-package-kong: cleanup setup-build +actual-package-kong: cleanup ifeq ($(DEBUG),1) exit 1 endif