aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Braun <roger@rogerbraun.net>2017-02-16 16:00:23 +0100
committerRoger Braun <roger@rogerbraun.net>2017-02-16 16:00:23 +0100
commitea03f3935e61c0a4398cc2921814c1d02a14616e (patch)
tree6d1e95f57925a2c6725847b51272a7f1f0a32942
parent5481cf00a3c8cc2a8707155e7b7383f2ebff92b1 (diff)
parent2203585a79217e371150a4deb05c6a006a3206a8 (diff)
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into develop
-rw-r--r--.gitlab-ci.yml11
1 files changed, 7 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fbe1f599..c05e34f4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
# This file is a template, and might need editing before it works on your project.
# Official framework image. Look for the different tagged releases at:
# https://hub.docker.com/r/library/node/tags/
-image: node:6
+image: node:7
before_script:
# Install ssh-agent if not already installed, it is required by Docker.
@@ -29,12 +29,14 @@ cache:
test:
script:
- - npm install
+ - npm install -g yarn
+ - yarn
- npm run unit
build:
script:
- - npm install
+ - npm install -g yarn
+ - yarn
- npm run build
artifacts:
paths:
@@ -45,6 +47,7 @@ deploy:
only:
- develop
script:
- - npm install
+ - npm install -g yarn
+ - yarn
- npm run build
- scp -r dist/* pleroma@tenshi.heldscal.la:~/pleroma