From 567915bb4ef3ad476481ab70f20314092b25f596 Mon Sep 17 00:00:00 2001
From: Dominik Thoennes <dominik.thoennes@fau.de>
Date: Mon, 4 Feb 2019 14:36:53 +0100
Subject: [PATCH] remove mscv 2015 from ci
---
.gitlab-ci.yml | 116 +++++--------------------------------------------
1 file changed, 12 insertions(+), 104 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 23804f1e9..203b3ca19 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,7 @@ stages:
- test
- deploy
-
+
###############################################################################
## ##
## Build templates ##
@@ -1205,7 +1205,7 @@ doc:
- docker
artifacts:
paths:
- - build/doc
+ - build/doc
expire_in: 1 weeks
@@ -1285,13 +1285,13 @@ coverage:
- ###############################################################################
- ## ##
- ## Windows Builds ##
- ## ##
- ###############################################################################
-
-
+###############################################################################
+## ##
+## Windows Builds ##
+## ##
+###############################################################################
+
+
.win_build_template: &win_build_definition
tags:
- win
@@ -1308,98 +1308,6 @@ coverage:
- ctest -LE $CTEST_EXCLUDE_LABELS -C $BUILD_CONFIGURATION --output-on-failure -j 4
-msvc-14_Hybrid_Dbg:
- <<: *win_build_definition
- variables:
- CMAKE_GENERATOR: "Visual Studio 14 2015 Win64"
- BUILD_CONFIGURATION: "DebugOptimized"
- CTEST_EXCLUDE_LABELS: "longrun"
- WALBERLA_BUILD_WITH_MPI: "ON"
- WALBERLA_BUILD_WITH_OPENMP: "ON"
- WALBERLA_DOUBLE_ACCURACY: "ON"
- except:
- variables:
- - $DISABLE_PER_COMMIT_BUILDS
-
-msvc-14_Hybrid_SP_Dbg:
- <<: *win_build_definition
- variables:
- CMAKE_GENERATOR: "Visual Studio 14 2015 Win64"
- BUILD_CONFIGURATION: "DebugOptimized"
- CTEST_EXCLUDE_LABELS: "longrun"
- WALBERLA_BUILD_WITH_MPI: "ON"
- WALBERLA_BUILD_WITH_OPENMP: "ON"
- WALBERLA_DOUBLE_ACCURACY: "OFF"
- only:
- variables:
- - $ENABLE_NIGHTLY_BUILDS
-
-msvc-14_Hybrid:
- <<: *win_build_definition
- variables:
- CMAKE_GENERATOR: "Visual Studio 14 2015 Win64"
- BUILD_CONFIGURATION: "Release"
- CTEST_EXCLUDE_LABELS: "longrun"
- WALBERLA_BUILD_WITH_MPI: "ON"
- WALBERLA_BUILD_WITH_OPENMP: "ON"
- WALBERLA_DOUBLE_ACCURACY: "ON"
- only:
- variables:
- - $ENABLE_NIGHTLY_BUILDS
-
-msvc-14_Serial_Dbg:
- <<: *win_build_definition
- variables:
- CMAKE_GENERATOR: "Visual Studio 14 2015 Win64"
- BUILD_CONFIGURATION: "DebugOptimized"
- CTEST_EXCLUDE_LABELS: "longrun"
- WALBERLA_BUILD_WITH_MPI: "OFF"
- WALBERLA_BUILD_WITH_OPENMP: "OFF"
- WALBERLA_DOUBLE_ACCURACY: "ON"
- only:
- variables:
- - $ENABLE_NIGHTLY_BUILDS
-
-msvc-14_Serial:
- <<: *win_build_definition
- variables:
- CMAKE_GENERATOR: "Visual Studio 14 2015 Win64"
- BUILD_CONFIGURATION: "Release"
- CTEST_EXCLUDE_LABELS: "longrun"
- WALBERLA_BUILD_WITH_MPI: "OFF"
- WALBERLA_BUILD_WITH_OPENMP: "OFF"
- WALBERLA_DOUBLE_ACCURACY: "ON"
- only:
- variables:
- - $ENABLE_NIGHTLY_BUILDS
-
-msvc-14_MpiOnly_Dbg:
- <<: *win_build_definition
- variables:
- CMAKE_GENERATOR: "Visual Studio 14 2015 Win64"
- BUILD_CONFIGURATION: "DebugOptimized"
- CTEST_EXCLUDE_LABELS: "longrun"
- WALBERLA_BUILD_WITH_MPI: "ON"
- WALBERLA_BUILD_WITH_OPENMP: "OFF"
- WALBERLA_DOUBLE_ACCURACY: "ON"
- only:
- variables:
- - $ENABLE_NIGHTLY_BUILDS
-
-msvc-14_MpiOnly:
- <<: *win_build_definition
- variables:
- CMAKE_GENERATOR: "Visual Studio 14 2015 Win64"
- BUILD_CONFIGURATION: "Release"
- CTEST_EXCLUDE_LABELS: "longrun"
- WALBERLA_BUILD_WITH_MPI: "ON"
- WALBERLA_BUILD_WITH_OPENMP: "OFF"
- WALBERLA_DOUBLE_ACCURACY: "ON"
- only:
- variables:
- - $ENABLE_NIGHTLY_BUILDS
-
-
msvc-14.1_Hybrid_Dbg:
<<: *win_build_definition
variables:
@@ -1587,7 +1495,7 @@ mac_MpiOnly:
dependencies: []
when: manual
only:
- - master@walberla/walberla
+ - master@walberla/walberla
- tags@walberla/walberla
conda-py36-win:
@@ -1596,7 +1504,7 @@ conda-py36-win:
- win
script:
- conda build --python=3.6 --user=lssfau utilities\\conda\\walberla
-
+
conda-py37-win:
<<: *conda_deploy_definition
tags:
@@ -1613,7 +1521,7 @@ conda-py37-linux:
- apt-get update
- apt-get install -y build-essential
- conda build --python=3.7 --user=lssfau utilities/conda/walberla
-
+
conda-py36-linux:
<<: *conda_deploy_definition
tags:
--
GitLab