diff options
| author | Mike Greiling <mike@pixelcog.com> | 2016-12-11 01:31:19 -0600 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-01-10 12:30:40 -0600 |
| commit | 1e8a4189dc4cd97702999367775c54c10463ffc9 (patch) | |
| tree | 21ad43d2e94f3c93dc42b01493e9405b9358d758 /.gitlab-ci.yml | |
| parent | 7c47cc94c5d7425583db3610c85cb150df601a91 (diff) | |
| download | gitlab-ce-1e8a4189dc4cd97702999367775c54c10463ffc9.tar.gz | |
move webpack asset compilation to the setup-test-env stage
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6e727333929..ebf165abf14 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,8 +24,6 @@ before_script: - '[ "$USE_BUNDLE_INSTALL" != "true" ] || retry bundle install --without postgres production --jobs $(nproc) $FLAGS' - retry gem install knapsack - '[ "$SETUP_DB" != "true" ] || bundle exec rake db:drop db:create db:schema:load db:migrate add_limits_mysql' - - curl --silent --location https://deb.nodesource.com/setup_6.x | bash - - - apt-get install --assume-yes nodejs - npm install stages: @@ -64,7 +62,6 @@ stages: <<: *dedicated-runner <<: *use-db script: - - bundle exec rake webpack:compile - JOB_NAME=( $CI_BUILD_NAME ) - export CI_NODE_INDEX=${JOB_NAME[1]} - export CI_NODE_TOTAL=${JOB_NAME[2]} @@ -83,7 +80,6 @@ stages: <<: *dedicated-runner <<: *use-db script: - - bundle exec rake webpack:compile - JOB_NAME=( $CI_BUILD_NAME ) - export CI_NODE_INDEX=${JOB_NAME[1]} - export CI_NODE_TOTAL=${JOB_NAME[2]} @@ -113,6 +109,7 @@ setup-test-env: <<: *dedicated-runner stage: prepare script: + - bundle exec rake webpack:compile - bundle exec rake assets:precompile 2>/dev/null - bundle exec ruby -Ispec -e 'require "spec_helper" ; TestEnv.init' artifacts: @@ -381,6 +378,8 @@ lint:javascript: - node_modules/ stage: test image: "node:7.1" + before_script: + - npm install script: - npm --silent run eslint @@ -391,6 +390,8 @@ lint:javascript:report: - node_modules/ stage: post-test image: "node:7.1" + before_script: + - npm install 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 |