summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2017-01-15 01:44:47 -0500
committerMike Greiling <mike@pixelcog.com>2017-01-15 10:32:14 -0500
commitc9dbd5f5130ea45ba83b0047bec47d222629c782 (patch)
tree0b0afed18c477c100f6ef359778eeec514786d32
parent8425e647fbd34c4c28d1d9df8fdf6495085a1f89 (diff)
downloadgitlab-ce-c9dbd5f5130ea45ba83b0047bec47d222629c782.tar.gz
optimize gitlab ci to only run npm install once
-rw-r--r--.gitlab-ci.yml7
1 files changed, 4 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a038af69665..6d77d94637a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,7 +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'
- - npm install
stages:
- prepare
@@ -109,12 +108,14 @@ setup-test-env:
<<: *dedicated-runner
stage: prepare
script:
+ - npm install
- bundle exec rake webpack:compile
- bundle exec rake assets:precompile 2>/dev/null
- bundle exec ruby -Ispec -e 'require "spec_helper" ; TestEnv.init'
artifacts:
expire_in: 7d
paths:
+ - node_modules
- public/assets
- tmp/tests
@@ -235,7 +236,7 @@ spinach 9 10 ruby21: *spinach-knapsack-ruby21
script:
- bundle exec $CI_BUILD_NAME
-rubocop:
+rubocop:
<<: *ruby-static-analysis
<<: *dedicated-runner
stage: test
@@ -298,7 +299,7 @@ karma:
cache:
paths:
- vendor/ruby
- - node_modules/
+ - node_modules
stage: test
<<: *use-db
<<: *dedicated-runner