From 8aea3949807ce8aa5a3b06a7be1a503b639e6a9b Mon Sep 17 00:00:00 2001 From: lambadalambda Date: Thu, 16 Feb 2017 07:44:09 -0500 Subject: [PATCH 1/2] Update .gitlab-ci.yml --- .gitlab-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fbe1f59917..9561e0616b 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. @@ -45,6 +45,7 @@ deploy: only: - develop script: - - npm install + - npm install -g yarn + - yarn - npm run build - scp -r dist/* pleroma@tenshi.heldscal.la:~/pleroma From 2203585a79217e371150a4deb05c6a006a3206a8 Mon Sep 17 00:00:00 2001 From: lambadalambda Date: Thu, 16 Feb 2017 07:48:36 -0500 Subject: [PATCH 2/2] Update .gitlab-ci.yml --- .gitlab-ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9561e0616b..c05e34f4cc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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: