Merge branch 'ci-cross-compile' into 'master'

minor tweaks to gitlab-ci

See merge request acs/public/simulation/dpsim!137

Former-commit-id: ff11c497

.gitlab-ci.yml

@@ -16,7 +16,6 @@ stages:
   - test
   - generate
   - deploy
-  #- post-all
 
 docker:
   stage: prepare
@@ -26,12 +25,12 @@ docker:
         --tag ${DOCKER_IMAGE_DEV}:${DOCKER_TAG_DEV}
         --tag ${DOCKER_IMAGE_DEV}:latest .
 # build dedicated jupyter image in the future
-#    - docker build
-#        --file Packaging/Docker/Dockerfile.jupyter
-#        --build-arg DOCKER_IMAGE=${DOCKER_IMAGE_DEV}
-#        --build-arg DOCKER_TAG=${DOCKER_TAG_DEV}
-#        --tag ${DOCKER_IMAGE_DEV}-jupyter:${DOCKER_TAG_DEV}
-#        --tag ${DOCKER_IMAGE_DEV}-jupyter:latest .
+    - docker build
+       --file Packaging/Docker/Dockerfile.jupyter
+       --build-arg DOCKER_IMAGE=${DOCKER_IMAGE_DEV}
+       --build-arg DOCKER_TAG=${DOCKER_TAG_DEV}
+       --tag ${DOCKER_IMAGE_DEV}-jupyter:${DOCKER_TAG_DEV}
+       --tag ${DOCKER_IMAGE_DEV}-jupyter:latest .
   tags:
     - shell
     - linux
@@ -217,16 +216,4 @@ deploy:packages:
   tags:
     - fein-deploy
     - shell
-    - linux
-
-# 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
+    - linux
\ No newline at end of file