Merge branch 'deployment-fix' into 'dev'

Fix gitlab-ci issue with the updated website

See merge request ligolang/ligo!471
This commit is contained in:
Sander 2020-03-04 15:06:26 +00:00
commit 7f0dd0c090

View File

@ -35,7 +35,7 @@ dont-merge-to-master:
.website_build: &website_build .website_build: &website_build
stage: build_and_deploy stage: build_and_deploy
image: node:8 image: node:12-alpine
dependencies: dependencies:
- build-and-package-debian-9 - build-and-package-debian-9
- build-and-package-debian-10 - build-and-package-debian-10
@ -66,13 +66,11 @@ dont-merge-to-master:
- cd gitlab-pages/website - cd gitlab-pages/website
- npm install - npm install
script: script:
- npm run version next
- npm run build - npm run build
# move internal odoc documentation to the website folder # move internal odoc documentation to the website folder
- mkdir -p build/ligo/ - mv ../../_build/default/_doc/_html/ build/odoc
- mv ../../_build/default/_doc/_html/ build/ligo/odoc
after_script: after_script:
- cp -r gitlab-pages/website/build/ligo public - cp -r gitlab-pages/website/build public
artifacts: artifacts:
paths: paths:
- public - public