Skip to content
Snippets Groups Projects
Commit 72002297 authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

Merge branch 'seperate-pages' into 'master'

Seperate pages from deploy to demo-master

See merge request AlekSIS/official/AlekSIS!335
parents 89b73b58 c9e05339
No related branches found
No related tags found
1 merge request!335Seperate pages from deploy to demo-master
Pipeline #3400 failed
...@@ -3,4 +3,5 @@ include: ...@@ -3,4 +3,5 @@ include:
- local: "/ci/test.yml" - local: "/ci/test.yml"
- local: "/ci/build_dist.yml" - local: "/ci/build_dist.yml"
- local: "/ci/build_docker.yml" - local: "/ci/build_docker.yml"
- local: "/ci/pages.yml"
- local: "/ci/deploy.yml" - local: "/ci/deploy.yml"
pages:
stage: deploy
before_script:
- cp -r .tox/screenshots/firefox docs/screenshots
script:
- export LC_ALL=en_GB.utf8
- tox -e docs -- BUILDDIR=../public/docs
artifacts:
paths:
- public/
only:
- master
deploy_demo-master: deploy_demo-master:
stage: deploy stage: deploy
environment: environment:
......
pages:
stage: deploy
before_script:
- cp -r .tox/screenshots/firefox docs/screenshots
script:
- export LC_ALL=en_GB.utf8
- tox -e docs -- BUILDDIR=../public/docs
artifacts:
paths:
- public/
only:
- master
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment