diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-02-14 19:09:52 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-02-14 19:09:52 +0000 |
| commit | efc82ebf3f7378f848b65c0a45a4052316bfd6db (patch) | |
| tree | e5df1ae3557663b5584b6488b6db7e9a1a03ef33 /.gitlab-ci.yml | |
| parent | 6676b4f0dd05ffb6071a3329cca4459e7cddcdc3 (diff) | |
| parent | ad5e772bddd7b417fa7a36629db02c69b1b9864d (diff) | |
| download | gitlab-ce-efc82ebf3f7378f848b65c0a45a4052316bfd6db.tar.gz | |
Merge branch 'master' into 'dz-nested-groups-improvements-3'
# Conflicts:
# doc/api/projects.md
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 733710bb005..7d0c976d816 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -107,7 +107,10 @@ setup-test-env: <<: *dedicated-runner stage: prepare script: - - npm install + - node --version + - yarn --version + - yarn install --pure-lockfile + - yarn check # ensure that yarn.lock matches package.json - bundle exec rake gitlab:assets:compile - bundle exec ruby -Ispec -e 'require "spec_helper" ; TestEnv.init' artifacts: @@ -246,7 +249,6 @@ karma: <<: *use-db <<: *dedicated-runner script: - - npm link istanbul - bundle exec rake karma artifacts: name: coverage-javascript @@ -325,11 +327,9 @@ lint:javascript: paths: - node_modules/ stage: test - image: "node:7.1" - before_script: - - npm install + before_script: [] script: - - npm --silent run eslint + - yarn run eslint lint:javascript:report: <<: *dedicated-runner @@ -337,12 +337,10 @@ lint:javascript:report: paths: - node_modules/ stage: post-test - image: "node:7.1" - before_script: - - npm install + before_script: [] script: - find app/ spec/ -name '*.js' -or -name '*.js.es6' -exec sed --in-place 's|/\* eslint-disable .*\*/||' {} \; # run report over all files - - npm --silent run eslint-report || true # ignore exit code + - yarn run eslint-report || true # ignore exit code artifacts: name: eslint-report expire_in: 31d |