diff options
| author | Igor Scheller <igor.scheller@igorshp.de> | 2018-09-03 21:56:49 +0200 |
|---|---|---|
| committer | msquare <msquare@notrademark.de> | 2018-09-03 22:09:07 +0200 |
| commit | 9f1ee0c6c6497d43fb275491ec53fda420f64b81 (patch) | |
| tree | 24d1a7a4b66704e6a059d6a5cff285a905c3506e /.gitlab-ci.yml | |
| parent | 2c1c00e9c97f1c9ac5719a0e6d2525e9632f38dd (diff) | |
Fixups and cleanup for GitLab CI
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 051a5bbe..431e3d08 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -51,10 +51,6 @@ test: when: always paths: - ./coverage/ - - ./unittests.xml - when: always - reports: - junit: ./unittests.xml coverage: '/^\s*Lines:\s*(\d+(?:\.\d+)?%)/' before_script: - apk add $PHPIZE_DEPS && pecl install xdebug && docker-php-ext-enable xdebug @@ -63,15 +59,10 @@ test: - HOMEDIR=$(pwd) - cd "${DOCROOT}" - composer --no-ansi install --dev - - chmod +x ./bin/migrate - ./bin/migrate script: - - set +e - - vendor/bin/phpunit -v --colors=never --coverage-text --coverage-html "${HOMEDIR}/coverage/" --log-junit "${HOMEDIR}/unittests.xml" - - status=$? - - set -e - - sed -i "s~${DOCROOT}~${HOMEDIR}/~g" "${HOMEDIR}/unittests.xml" - - exit $status + - vendor/bin/phpunit -v --colors=never --coverage-text --coverage-html "${HOMEDIR}/coverage/" + - ./bin/migrate down release-image: <<: *docker_definition @@ -102,7 +93,6 @@ release-image.nginx: .deploy_template_script: # Configure SSH - &deploy_template_script |- - apt update && apt install -yqq rsync openssh-client mkdir -p ~/.ssh echo "$SSH_PRIVATE_KEY" | sed -e 's/\r//g' > ~/.ssh/id_ed25519 chmod 600 ~/.ssh/id_ed25519 |