Commit 7863beb1 authored by Steffen Vogel's avatar Steffen Vogel 🎅🏼 Committed by Markus Mirz
Browse files

minor tweaks to gitlab-ci

parent c303bdba
...@@ -16,7 +16,6 @@ stages: ...@@ -16,7 +16,6 @@ stages:
- test - test
- generate - generate
- deploy - deploy
#- post-all
docker: docker:
stage: prepare stage: prepare
...@@ -26,12 +25,12 @@ docker: ...@@ -26,12 +25,12 @@ docker:
--tag ${DOCKER_IMAGE_DEV}:${DOCKER_TAG_DEV} --tag ${DOCKER_IMAGE_DEV}:${DOCKER_TAG_DEV}
--tag ${DOCKER_IMAGE_DEV}:latest . --tag ${DOCKER_IMAGE_DEV}:latest .
# build dedicated jupyter image in the future # build dedicated jupyter image in the future
# - docker build - docker build
# --file Packaging/Docker/Dockerfile.jupyter --file Packaging/Docker/Dockerfile.jupyter
# --build-arg DOCKER_IMAGE=${DOCKER_IMAGE_DEV} --build-arg DOCKER_IMAGE=${DOCKER_IMAGE_DEV}
# --build-arg DOCKER_TAG=${DOCKER_TAG_DEV} --build-arg DOCKER_TAG=${DOCKER_TAG_DEV}
# --tag ${DOCKER_IMAGE_DEV}-jupyter:${DOCKER_TAG_DEV} --tag ${DOCKER_IMAGE_DEV}-jupyter:${DOCKER_TAG_DEV}
# --tag ${DOCKER_IMAGE_DEV}-jupyter:latest . --tag ${DOCKER_IMAGE_DEV}-jupyter:latest .
tags: tags:
- shell - shell
- linux - linux
...@@ -217,16 +216,4 @@ deploy:packages: ...@@ -217,16 +216,4 @@ deploy:packages:
tags: tags:
- fein-deploy - fein-deploy
- shell - shell
- linux - linux
\ No newline at end of file
# We run the windows build at last as it takes ages to finish
#build:windows:
# stage: post-all
# script:
# - rmdir build /s
# - mkdir build
# - cd build
# - cmake -G "Visual Studio 15 2017 Win64" ..
# - cmake --build .
# tags:
# - windows
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