From 336270bfcbb928f56656fb63fbc2bc257ab008b1 Mon Sep 17 00:00:00 2001 From: Michal Cichra Date: Wed, 25 Oct 2017 15:57:15 +0200 Subject: [PATCH] drop danger integration because it broke --- .travis.yml | 4 ++-- Makefile | 8 -------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 13de66dfd..ae8ca0c1d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,5 +33,5 @@ before_install: - travis/install-s2i.sh - export PATH="${PATH}:${HOME}/openresty/bin:${HOME}/openresty/luajit/bin:${HOME}/openresty/nginx/sbin:${HOME}/bin:${HOME}/.luarocks/bin" script: -- make builder-image danger -- make test-doc \ No newline at end of file +- make builder-image +- make test-doc diff --git a/Makefile b/Makefile index a56b69a3f..f699f5c28 100644 --- a/Makefile +++ b/Makefile @@ -28,8 +28,6 @@ endif export COMPOSE_PROJECT_NAME -DANGER_IMAGE ?= quay.io/3scale/danger - test: ## Run all tests $(MAKE) --keep-going busted prove builder-image test-builder-image prove-docker runtime-image test-runtime-image @@ -39,12 +37,6 @@ apicast-source: ## Create Docker Volume container with APIcast source code docker create --rm -v /opt/app-root/src --name $(COMPOSE_PROJECT_NAME)-source $(IMAGE_NAME) /bin/true docker cp . $(COMPOSE_PROJECT_NAME)-source:/opt/app-root/src -danger: apicast-source -danger: TEMPFILE := $(shell mktemp) -danger: - env | grep -E 'CIRCLE|TRAVIS|DANGER|SEAL' > $(TEMPFILE) - docker pull $(DANGER_IMAGE) - docker run --rm -w /opt/app-root/src --volumes-from=$(COMPOSE_PROJECT_NAME)-source --env-file=$(TEMPFILE) -u $(shell id -u) $(DANGER_IMAGE) danger busted: dependencies $(ROVER) ## Test Lua. @$(ROVER) exec bin/busted