Commit 2a1bb86a authored by helmo's avatar helmo
Browse files

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.
parents b2ec92f3 d8804c84
...@@ -10,12 +10,28 @@ before_script: ...@@ -10,12 +10,28 @@ before_script:
# Defines stages which are to be executed # Defines stages which are to be executed
stages: stages:
- syntax
- build - build
- test - test
- publish - publish
- upgradetest - upgradetest
#
### 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" ### Stage "build"
# #
...@@ -49,10 +65,13 @@ build:deb: ...@@ -49,10 +65,13 @@ build:deb:
test:debian-jessie-aegir3-apt: test:debian-jessie-aegir3-apt:
stage: test stage: test
image: debian:jessie image: debian:jessie
allow_failure: false
dependencies: dependencies:
- build:deb - build:deb
only: when: manual
except:
- 7.x-3.x - 7.x-3.x
- /^7\.x-3\.\d+\.x/
before_script: before_script:
- apt-get update - apt-get update
...@@ -66,7 +85,7 @@ test:debian-jessie-aegir3-apt: ...@@ -66,7 +85,7 @@ test:debian-jessie-aegir3-apt:
test:debian-stretch-aegir3-apt: test:debian-stretch-aegir3-apt:
stage: test stage: test
image: debian:stretch image: debian:stretch
allow_failure: true allow_failure: false
dependencies: dependencies:
- build:deb - build:deb
...@@ -82,10 +101,14 @@ test:debian-stretch-aegir3-apt: ...@@ -82,10 +101,14 @@ test:debian-stretch-aegir3-apt:
test:ubuntu-xenial-aegir3-apt: test:ubuntu-xenial-aegir3-apt:
stage: test stage: test
image: ubuntu:xenial image: ubuntu:xenial
allow_failure: false
dependencies: dependencies:
- build:deb - build:deb
only:
when: manual
except:
- 7.x-3.x - 7.x-3.x
- /^7\.x-3\.\d+\.x/
before_script: before_script:
- apt-get update - apt-get update
...@@ -99,9 +122,14 @@ test:ubuntu-xenial-aegir3-apt: ...@@ -99,9 +122,14 @@ test:ubuntu-xenial-aegir3-apt:
test:ubuntu-artful-aegir3-apt: test:ubuntu-artful-aegir3-apt:
stage: test stage: test
image: ubuntu:artful image: ubuntu:artful
allow_failure: true
dependencies: dependencies:
- build:deb - build:deb
allow_failure: true
when: manual
except:
- 7.x-3.x
- /^7\.x-3\.\d+\.x/
before_script: before_script:
- apt-get update - apt-get update
...@@ -153,7 +181,6 @@ publish:unstable-repo: ...@@ -153,7 +181,6 @@ publish:unstable-repo:
stage: publish stage: publish
dependencies: dependencies:
- build:deb - build:deb
allow_failure: true
only: only:
- 7.x-3.x - 7.x-3.x
...@@ -191,6 +218,7 @@ upgradetest:debian-jessie-aegir3-apt-upgrade: ...@@ -191,6 +218,7 @@ upgradetest:debian-jessie-aegir3-apt-upgrade:
image: debian:jessie image: debian:jessie
dependencies: dependencies:
- publish:unstable-repo - publish:unstable-repo
allow_failure: false
when: manual when: manual
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment