Changed the .gitlab-ci.yml structure

Beginned with new building system
.gitlab-ci.yml can now be generated by the script assemble-gitlab-ci.py.

Therefore the .gitlab-ci.yml configuration file can be split into several smaller files
This commit is contained in:
Johannes Lenzen
2019-11-26 12:23:52 +01:00
committed by Jan Möbius
parent a85ac6894b
commit 7ab45135cc
9 changed files with 272 additions and 217 deletions

View File

@@ -30,14 +30,14 @@ elif [ "$COMPILER" == "clang" ]; then
BUILDPATH="clang"
fi
if [ "$LANGUAGE" == "C++98" ]; then
if [ "$LANGUAGE" == "cpp98" ]; then
echo "Building with C++98";
BUILDPATH="$BUILDPATH-cpp98"
elif [ "$LANGUAGE" == "C++11" ]; then
elif [ "$LANGUAGE" == "cpp11" ]; then
echo "Building with C++11";
OPTIONS="$OPTIONS -DCMAKE_CXX_FLAGS='-std=c++11' "
BUILDPATH="$BUILDPATH-cpp11"
elif [ "$LANGUAGE" == "C++14" ]; then
elif [ "$LANGUAGE" == "cpp14" ]; then
echo "Building with C++14";
OPTIONS="$OPTIONS -DCMAKE_CXX_FLAGS='-std=c++14' "
BUILDPATH="$BUILDPATH-cpp14"
@@ -51,9 +51,9 @@ OUTPUT='\033[0;32m'
WARNING='\033[0;93m'
if [ "$BUILD_TYPE" == "release" ]; then
export BUILD_TYPE=Release
export BUILD_TYPE_L=release
export BUILD_TYPE=release
BUILDPATH="$BUILDPATH-release"
else
export BUILD_TYPE=Debug
export BUILD_TYPE_L=debug
export BUILD_TYPE=debug
BUILDPATH="$BUILDPATH-debug"
fi