summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHerman van Rink2017-10-13 16:28:21 +0200
committerHerman van Rink2017-10-13 16:31:58 +0200
commit2a1bb86a3830ad5f297f1ca6209b523dbafb7593 (patch)
tree8d64532b5664e4730ce2262530921e82ec1a8af5
parentb2ec92f38e52e8287407b0c145774cc45b962389 (diff)
parentd8804c846881db275e1ff269f7f28c3bfd345044 (diff)
Merge branch 'ci-syntax-test' into 7.x-3.x
Add lint check and set some tests to manual that were for a master branch only.
-rw-r--r--.gitlab-ci.yml38
1 files changed, 33 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f7267ba..48815f2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,6 +10,7 @@ before_script:
# Defines stages which are to be executed
stages:
+ - syntax
- build
- test
- publish
@@ -17,6 +18,21 @@ stages:
#
+### Stage syntax
+#
+
+syntax:codestyle:
+ stage: syntax
+ image: bobey/docker-gitlab-ci-runner-php5.6
+ allow_failure: false
+
+ script:
+ - composer require phplint/phplint
+ - echo "Syntax checking PHP files"
+ - echo "For more information http://www.icosaedro.it/phplint/"
+ - vendor/bin/phplint ./ --exclude "vendor"
+
+#
### Stage "build"
#
@@ -49,10 +65,13 @@ build:deb:
test:debian-jessie-aegir3-apt:
stage: test
image: debian:jessie
+ allow_failure: false
dependencies:
- build:deb
- only:
+ when: manual
+ except:
- 7.x-3.x
+ - /^7\.x-3\.\d+\.x/
before_script:
- apt-get update
@@ -66,7 +85,7 @@ test:debian-jessie-aegir3-apt:
test:debian-stretch-aegir3-apt:
stage: test
image: debian:stretch
- allow_failure: true
+ allow_failure: false
dependencies:
- build:deb
@@ -82,10 +101,14 @@ test:debian-stretch-aegir3-apt:
test:ubuntu-xenial-aegir3-apt:
stage: test
image: ubuntu:xenial
+ allow_failure: false
dependencies:
- build:deb
- only:
+
+ when: manual
+ except:
- 7.x-3.x
+ - /^7\.x-3\.\d+\.x/
before_script:
- apt-get update
@@ -99,9 +122,14 @@ test:ubuntu-xenial-aegir3-apt:
test:ubuntu-artful-aegir3-apt:
stage: test
image: ubuntu:artful
+ allow_failure: true
dependencies:
- build:deb
- allow_failure: true
+
+ when: manual
+ except:
+ - 7.x-3.x
+ - /^7\.x-3\.\d+\.x/
before_script:
- apt-get update
@@ -153,7 +181,6 @@ publish:unstable-repo:
stage: publish
dependencies:
- build:deb
- allow_failure: true
only:
- 7.x-3.x
@@ -191,6 +218,7 @@ upgradetest:debian-jessie-aegir3-apt-upgrade:
image: debian:jessie
dependencies:
- publish:unstable-repo
+ allow_failure: false
when: manual