Moved build job for gitlab-pages into the main .gitlab-ci.yml

This commit is contained in:
Georges Dupéron 2019-05-27 17:06:18 +02:00
parent cdf6d16a66
commit dfa7932fe8
2 changed files with 18 additions and 16 deletions

View File

@ -1,3 +1,4 @@
# TODO: remove this as submodules aren't used anymore.
variables: variables:
GIT_SUBMODULE_STRATEGY: recursive GIT_SUBMODULE_STRATEGY: recursive
@ -67,3 +68,20 @@ build-docker-image:
- docker:dind - docker:dind
script: script:
- docker build -t marigold/ligo ./docker - docker build -t marigold/ligo ./docker
pages:
image: node:8
before_script:
- cd gitlab-pages/website
- npm install
script:
- npm run build
- pwd
- cd ../..
- pwd
- cp -r gitlab-pages/website/build/ligo public
artifacts:
paths:
- public
only:
- master

View File

@ -1,16 +0,0 @@
image: node:8
before_script:
- cd website
- npm install
pages:
script:
- npm run build
- cd ..
- cp -r website/build/ligo public
artifacts:
paths:
- public
only:
- master