summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-11-22 06:28:30 +0000
committerRobert Speicher <robert@gitlab.com>2016-11-22 06:28:30 +0000
commit35d6ea4f5ee7605a7f4e4c44cc4b79a40aec9418 (patch)
tree5989734f6ed44c2cea627408fd9c89b576769859
parente76c195ebd0987b241e8c9d1b4f231ac12ba7cf8 (diff)
parentaed42cc099e496f8facdf7b8db6b8e66910c0dee (diff)
downloadgitlab-ce-35d6ea4f5ee7605a7f4e4c44cc4b79a40aec9418.tar.gz
Merge branch 'add-node-modules-cache-to-npm-related-builds' into 'master'
Add node_modules cache to npm related builds See merge request !7548
-rw-r--r--.gitlab-ci.yml12
-rw-r--r--package.json3
2 files changed, 12 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bb94fc41ad1..ab45ea57aed 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -271,12 +271,17 @@ rake db:seed_fu:
- log/development.log
teaspoon:
+ cache:
+ paths:
+ - vendor/ruby
+ - node_modules/
stage: test
<<: *use-db
script:
- curl --silent --location https://deb.nodesource.com/setup_6.x | bash -
- apt-get install --assume-yes nodejs
- - npm install --global istanbul
+ - npm install
+ - npm link istanbul
- rake teaspoon
artifacts:
name: coverage-javascript
@@ -345,8 +350,11 @@ coverage:
- coverage/assets/
lint-javascript:
+ cache:
+ paths:
+ - node_modules/
stage: test
- image: "node:latest"
+ image: "node:7.1"
before_script:
- npm install
script:
diff --git a/package.json b/package.json
index e75e070451b..2a9fb808eef 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,7 @@
"eslint-plugin-import": "^2.0.1",
"eslint-plugin-jasmine": "^1.8.1",
"eslint-plugin-jsx-a11y": "^2.2.3",
- "eslint-plugin-react": "^6.4.1"
+ "eslint-plugin-react": "^6.4.1",
+ "istanbul": "^0.4.5"
}
}