Commit 076bf510 authored by Jan Möbius's avatar Jan Möbius
Browse files

Merge branch 'clang_parallel' into 'master'

Clang parallel

Change CI settings to get build times for OpenFlipper with clang below 10 minutes

See merge request !56
parents bce5acd2 356d2fc4
Pipeline #698 failed with stage
......@@ -7,6 +7,7 @@ clang-c++11-Qt4:
script: "CI/ci-linux.sh clang C++11 QT4"
tags:
- Linux
- MultiThreads
gcc-c++98-Qt4:
script: "CI/ci-linux.sh gcc C++98 QT4"
......@@ -17,6 +18,7 @@ clang-c++98-Qt4:
script: "CI/ci-linux.sh clang C++98 QT4"
tags:
- Linux
- MultiThreads
gcc-c++11-Qt5:
script: "CI/ci-linux.sh gcc C++11 QT5"
......@@ -27,6 +29,7 @@ clang-c++11-Qt5:
script: "CI/ci-linux.sh clang C++11 QT5"
tags:
- Linux
- MultiThreads
gcc-c++98-Qt5:
script: "CI/ci-linux.sh gcc C++98 QT5"
......@@ -37,3 +40,4 @@ clang-c++98-Qt5:
script: "CI/ci-linux.sh clang C++98 QT5"
tags:
- Linux
- MultiThreads
......@@ -30,6 +30,8 @@ elif [ "$COMPILER" == "clang" ]; then
# export ICECC_CXX=/usr/bin/clang++ ; export ICECC_CC=/usr/bin/clang
BUILDPATH="clang"
MAKE_OPTIONS="-j6"
echo "Building with CLANG";
fi
......
Markdown is supported
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