Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into develop

This commit is contained in:
Roger Braun 2017-02-16 16:00:23 +01:00
commit ea03f3935e

View file

@ -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