Commit 0814f42a authored by Jan Möbius's avatar Jan Möbius
Browse files

Merge branch 'move_CI' into 'master'

Move ci

Moved CI Scripts for OpenFlipper Free into OpenFlipper Subdirectory

See merge request !205
parents 19575a54 323df99e
Pipeline #3868 passed with stage
in 38 minutes and 22 seconds
gcc-c++11-Qt5:
script: "CI/ci-linux.sh gcc C++11 QT5"
variables:
COMPILER: "gcc"
LANGUAGE: "C++11"
QTVERSION: "QT5"
script: "OpenFlipper/CI/ci-linux.sh"
tags:
- Linux
clang-c++11-Qt5:
script: "CI/ci-linux.sh clang C++11 QT5"
variables:
COMPILER: "clang"
LANGUAGE: "C++11"
QTVERSION: "QT5"
script: "OpenFlipper/CI/ci-linux.sh"
tags:
- Linux
- MultiThreads
cppcheck:
script: "CI/ci-cppcheck.sh"
script: "OpenFlipper/CI/ci-cppcheck.sh"
tags:
- Linux
- MultiThreads
......@@ -19,7 +27,7 @@ cppcheck:
- cppcheck.log
VS2015-Qt-5.6.0-x64:
script: "CI\\VS2015-Qt-5.6.0-x64.bat"
script: "OpenFlipper\\CI\\VS2015-Qt-5.6.0-x64.bat"
tags:
- VS2015
- Qt56
......@@ -28,7 +36,7 @@ VS2015-Qt-5.6.0-x64:
- rel/*.exe
VS2015-Qt-5.6.0-x32:
script: "CI\\VS2015-Qt-5.6.0-x32.bat"
script: "OpenFlipper\\CI\\VS2015-Qt-5.6.0-x32.bat"
tags:
- VS2015
- Qt56
......@@ -38,7 +46,7 @@ VS2015-Qt-5.6.0-x32:
VS2013-Qt-5.5.1-x64:
script: "CI\\VS2013-Qt-5.5.1-x64.bat"
script: "OpenFlipper\\CI\\VS2013-Qt-5.5.1-x64.bat"
tags:
- VS2013
- Qt551
......@@ -47,7 +55,7 @@ VS2013-Qt-5.5.1-x64:
- rel/*.exe
Mac-Cpp11:
script: "CI/ci-mac.sh"
script: "OpenFlipper/CI/ci-mac.sh"
cache:
paths:
- build-release/
......
......@@ -3,9 +3,10 @@
# Script abort on error
set -e
COMPILER=$1
LANGUAGE=$2
QTVERSION=$3
# Expected Settings via environment variables:
# COMPILER= gcc/clang
# LANGUAGE= C++98 / C++11
# QTVERSION= QT4/QT5
OPTIONS=""
MAKE_OPTIONS=""
......
......@@ -21,4 +21,5 @@ http://openflipper.org/Documentation/latest/buildingOpenFlipper.html
Latest NEWS
===========
- 12.08.2016: Moved the cmake directory contents into OpenFlipper/cmake (First steps to reduce number of toplevel dirs and get more modular than before)
- 12/08/2016: Moved CI directory into OpenFlipper subdirectory to remove toplevel dir count
- 12/08/2016: Moved the cmake directory contents into OpenFlipper/cmake (First steps to reduce number of toplevel dirs and get more modular than before)
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