Commit 6e3e48d4 authored by Markus Mirz's avatar Markus Mirz
Browse files

fix ci

parent e448b1bf
...@@ -14,7 +14,7 @@ stages: ...@@ -14,7 +14,7 @@ stages:
- prepare - prepare
- build - build
- test - test
- docs - generate
- deploy - deploy
#- post-all #- post-all
...@@ -51,8 +51,8 @@ test:pytest: ...@@ -51,8 +51,8 @@ test:pytest:
tags: tags:
- docker - docker
build:docs: generate:docs:
stage: docs stage: generate
script: script:
- make -C build docs - make -C build docs
- make -C build docs_cxx - make -C build docs_cxx
...@@ -66,8 +66,8 @@ build:docs: ...@@ -66,8 +66,8 @@ build:docs:
tags: tags:
- docker - docker
build:packages: generate:packages:
stage: build stage: generate
script: script:
- make -C build package - make -C build package
only: only:
...@@ -107,7 +107,7 @@ deploy:docs: ...@@ -107,7 +107,7 @@ deploy:docs:
- rsync ${RSYNC_OPTS} --delete build/Documentation/html/ ${DEPLOY_USER}@${DEPLOY_HOST}:${DEPLOY_PATH}/doc/${CI_BUILD_REF_NAME}/sphinx - rsync ${RSYNC_OPTS} --delete build/Documentation/html/ ${DEPLOY_USER}@${DEPLOY_HOST}:${DEPLOY_PATH}/doc/${CI_BUILD_REF_NAME}/sphinx
- rsync ${RSYNC_OPTS} --delete build/Documentation/Cxx/html/ ${DEPLOY_USER}@${DEPLOY_HOST}:${DEPLOY_PATH}/doc/${CI_BUILD_REF_NAME}/doxygen - rsync ${RSYNC_OPTS} --delete build/Documentation/Cxx/html/ ${DEPLOY_USER}@${DEPLOY_HOST}:${DEPLOY_PATH}/doc/${CI_BUILD_REF_NAME}/doxygen
dependencies: dependencies:
- build:docs - generate:docs
only: only:
- tags - tags
- master - master
...@@ -124,7 +124,7 @@ deploy:packages: ...@@ -124,7 +124,7 @@ deploy:packages:
- rsync ${RSYNC_OPTS} build/*.tar.gz ${DEPLOY_USER}@${DEPLOY_HOST}:/var/www/dpsim/src - rsync ${RSYNC_OPTS} build/*.tar.gz ${DEPLOY_USER}@${DEPLOY_HOST}:/var/www/dpsim/src
- ssh ${DEPLOY_USER}@${DEPLOY_HOST} createrepo /var/www/packages/redhat - ssh ${DEPLOY_USER}@${DEPLOY_HOST} createrepo /var/www/packages/redhat
dependencies: dependencies:
- build:packages - generate:packages
only: only:
- tags - tags
tags: tags:
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment