From 2f616d9324f1ca50f23cf63c96989a1ce65a4fb5 Mon Sep 17 00:00:00 2001
From: Okhin <okhin@okhin.fr>
Date: Sat, 13 Oct 2018 19:48:13 +0200
Subject: [PATCH] Updating the CI to say to make to keep going
---
.gitlab-ci.yml | 2 +-
Makefile | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 84d1d3b..1565508 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -45,7 +45,7 @@ job test:
- echo "SQL_DATABASE=${SQL_DATABASE}" >> app/env
- make install
- make server-start
- - make test
+ - make -k test
- make server-stop
- mysql -u $SQL_USER -p$SQL_PASSWORD -e "DROP DATABASE $SQL_DATABASE"
tags:
diff --git a/Makefile b/Makefile
index 2d5d78c..6c61db8 100644
--- a/Makefile
+++ b/Makefile
@@ -71,7 +71,7 @@ server-start: server-stop ## Launch a local server
@echo "\033[32mServer running. (http://127.0.0.1:8000)\033[0m"
server-stop: ## Stop local server if running
- @ps -aux | grep "[p]hp -S 127.0.0.1:8000" | grep -v grep | awk '{print $$2}' | xargs -r -n 1 kill
+ -@ps -aux | grep "[p]hp -S 127.0.0.1:8000" | grep -v grep | awk '{print $$2}' | xargs -r -n 1 kill
@echo "\033[32mServer stopped. (http://127.0.0.1:8000)\033[0m"
cs-fix: ## Fix CS
--
GitLab