From c6726b955d084e6e8eef5af3aeb730984714f526 Mon Sep 17 00:00:00 2001
From: David Beniamine <david.beniamine@tetras-libre.fr>
Date: Tue, 30 Nov 2021 17:37:09 +0100
Subject: [PATCH] Improve CI script
---
.gitlab-ci.yml | 2 --
tools/ci-job.sh | 13 +++++++++++--
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 00cd77b..40759f1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,8 +36,6 @@ composer:
- if: '$CI_COMMIT_MESSAGE =~ /test/'
- if: '$CI_COMMIT_BRANCH =~ /test/ || $CI_COMMIT_BRANCH == "production" || $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
script:
- - echo ${CI_PROJECT_DIR}
- - ls ${CI_PROJECT_DIR}
- docker run -v ${CI_PROJECT_DIR}:/sites/memorekall/www/web_dev -v /log:/sites/memorekall/www/log $TEST_IMAGE ./tools/ci-job.sh
artifacts:
when: always
diff --git a/tools/ci-job.sh b/tools/ci-job.sh
index 90f887c..4717f4a 100755
--- a/tools/ci-job.sh
+++ b/tools/ci-job.sh
@@ -1,7 +1,16 @@
#!/bin/bash
-cd "$(dirname $0)/.."
+exit_on_fail(){
+ if [ $1 -ne 0 ];
+ then
+ echo "Failed $2"
+ exit $1
+ fi
+}
composer install
+exit_on_fail $? "PHP dependencies"
npm install
+exit_on_fail $? "Javascript dependencies"
npm run dev
+exit_on_fail $? "Building assets"
composer ci
-
+exit_on_fail $? "Tests"
--
GitLab