From bcfb1ecefa97afeafac8172776217124cf381132 Mon Sep 17 00:00:00 2001 From: Mustapha Zorgati <15628173+mustaphazorgati@users.noreply.github.com> Date: Wed, 23 Oct 2019 05:49:21 +0200 Subject: [PATCH] TSK-925: extracted web as seperate job. --- .travis.yml | 11 ++++++----- ci/test.sh | 5 ++++- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 68cac0789..9fe61b35f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,9 +18,10 @@ cache: - web/node_modules stages: - - Compile - - Test - - "Release / Deploy" + - name: Compile + - name: Test + - name: "Release / Deploy" + if: repo = env(DEPLOY_REPO) AND (tag =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ OR branch = master) AND type != pull_request env: global: @@ -31,6 +32,7 @@ env: - DB=DB2_11_1 - DB=POSTGRES_10_4 - DB=HISTORY + - DB=WEB stage: Test install: skip @@ -100,5 +102,4 @@ matrix: organization: "NovaTec Consulting GmbH" space: Taskana on: - all_branches: true - if: repo = env(DEPLOY_REPO) AND (tag =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ OR branch = master) AND type != pull_request + all_branches: true \ No newline at end of file diff --git a/ci/test.sh b/ci/test.sh index 732321c12..8f09ec2a4 100755 --- a/ci/test.sh +++ b/ci/test.sh @@ -33,7 +33,6 @@ function main() { eval "$REL/prepare_db.sh '$1'" # We can not use the fance '-f' maven option due to a bug in arquillian. See https://issues.jboss.org/browse/THORN-2049 (cd $REL/.. && mvn -q install -B -T 4C -am -Dmaven.javadoc.skip -Dcheckstyle.skip) - (cd $REL/../web && npm install --silent && npm run test) ;; DB2_10_5 | DB2_11_1) set -x @@ -59,6 +58,10 @@ function main() { ### TEST ### mvn -q verify -B -f $REL/../history -Dmaven.javadoc.skip -Dcheckstyle.skip ;; + WEB) + set -x + (cd $REL/../web && npm install --silent && npm run test) + ;; esac }