diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-10-12 20:49:57 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-10-12 20:49:57 +0300 |
| commit | f01b9f258968f45d40e0d182e8c35db861958052 (patch) | |
| tree | d7652340e2d426f6d6717288d679b4c9c270a3c2 /.gitlab-ci.yml | |
| parent | 6782861afe6dbd53d2b550f38697d6a7d263ba0f (diff) | |
| download | manaplus-f01b9f258968f45d40e0d182e8c35db861958052.tar.gz manaplus-f01b9f258968f45d40e0d182e8c35db861958052.tar.bz2 manaplus-f01b9f258968f45d40e0d182e8c35db861958052.tar.xz manaplus-f01b9f258968f45d40e0d182e8c35db861958052.zip | |
Join different small linter jobs into one in .gitlab-ci.yml
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 31 |
1 files changed, 5 insertions, 26 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 839bb85d6..74836a528 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -294,13 +294,16 @@ mplint: PACKAGES: gcc g++ git make autoconf automake autopoint gettext -cpplint: +linters: stage: prebuild script: + - ./tools/ci/jobs/pngcheck.sh + - ./tools/ci/jobs/imagemagiccheck.sh - ./tools/ci/jobs/cpplint.sh + - ./tools/ci/jobs/nsiqcppstyle.sh <<: *job-push variables: - PACKAGES: python wget + PACKAGES: python wget pngcheck imagemagick git grep gcc-5_h_all: stage: prebuild @@ -335,30 +338,6 @@ gcc-5_h_all_i386: tags: - docker -pngcheck: - stage: prebuild - script: - - ./tools/ci/jobs/pngcheck.sh - <<: *job-push - variables: - PACKAGES: pngcheck - -icccheck: - stage: prebuild - script: - - ./tools/ci/jobs/imagemagiccheck.sh - <<: *job-push - variables: - PACKAGES: imagemagick - -nsiqcppstyle: - stage: prebuild - script: - - ./tools/ci/jobs/nsiqcppstyle.sh - <<: *job-push - variables: - PACKAGES: "git python grep" - # tests # disabled due gitlab bug |