diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2017-03-08 13:34:40 -0500 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2017-03-08 17:40:33 -0500 |
| commit | bd85046c61273b009e8cc7a75f6831e622edc03b (patch) | |
| tree | 18750d9f282a0f8ec9a5be2cd534409cca06caa8 | |
| parent | 8707db80d67942f9fe38050a4bb51a3213e03fb0 (diff) | |
| download | gitlab-ce-bd85046c61273b009e8cc7a75f6831e622edc03b.tar.gz | |
Move all lint tests to their own stage, run before testrs-lint-stage
These jobs are relatively fast, and there's no point running the more
expensive tests if these fail.
| -rw-r--r-- | .gitlab-ci.yml | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index deeb01f9a3c..99fa2f59512 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,6 +27,7 @@ before_script: stages: - prepare +- lint - test - post-test - pages @@ -180,22 +181,26 @@ spinach 9 10: *spinach-knapsack script: - bundle exec $CI_BUILD_NAME +.exec-lint: &exec-lint + <<: *exec + stage: lint + rubocop: <<: *ruby-static-analysis <<: *dedicated-runner - stage: test + stage: lint script: - bundle exec "rubocop --require rubocop-rspec" -rake haml_lint: *exec -rake scss_lint: *exec -rake config_lint: *exec -rake brakeman: *exec -rake flay: *exec -license_finder: *exec -rake downtime_check: *exec +rake haml_lint: *exec-lint +rake scss_lint: *exec-lint +rake config_lint: *exec-lint +rake brakeman: *exec-lint +rake flay: *exec-lint +license_finder: *exec-lint +rake downtime_check: *exec-lint rake ee_compat_check: - <<: *exec + <<: *exec-lint only: - branches@gitlab-org/gitlab-ce except: @@ -216,7 +221,7 @@ rake ee_compat_check: - ee_compat_check/patches/*.patch rake db:migrate:reset: - stage: test + stage: lint <<: *use-db <<: *dedicated-runner script: @@ -276,7 +281,7 @@ rake karma: - coverage-javascript/ lint-doc: - stage: test + stage: lint <<: *dedicated-runner image: "phusion/baseimage:latest" before_script: [] @@ -284,14 +289,14 @@ lint-doc: - scripts/lint-doc.sh bundler:check: - stage: test + stage: lint <<: *dedicated-runner <<: *ruby-static-analysis script: - bundle check bundler:audit: - stage: test + stage: lint <<: *ruby-static-analysis <<: *dedicated-runner only: @@ -345,7 +350,7 @@ lint:javascript: cache: paths: - node_modules/ - stage: test + stage: lint before_script: [] script: - yarn run eslint |