Commit 47baf9a2 authored by Jan Möbius's avatar Jan Möbius

Merge branch 'unstable' into 'master'

synchronize master with unstable branch

Closes #126

See merge request !305
parents 40b1cc25 986ecc51
Pipeline #6540 passed with stages
in 163 minutes and 11 seconds
......@@ -18,8 +18,9 @@ gcc-c++11-Qt5:
tags:
- Linux
artifacts:
expire_in: 1 week
paths:
- build-release-gcc-cpp11-qt5/
- artifacts
gcc-c++11-Qt5.9.0:
stage:
......@@ -33,8 +34,9 @@ gcc-c++11-Qt5.9.0:
tags:
- Linux
artifacts:
expire_in: 1 week
paths:
- build-release-gcc-cpp11-qt5.9.0/
- artifacts
clang-c++11-Qt5:
stage:
......@@ -49,8 +51,9 @@ clang-c++11-Qt5:
- Linux
- MultiThreads
artifacts:
expire_in: 1 week
paths:
- build-release-clang-cpp11-qt5/
- artifacts
clang-c++11-Qt5.9.0:
stage:
......@@ -65,8 +68,9 @@ clang-c++11-Qt5.9.0:
- Linux
- MultiThreads
artifacts:
expire_in: 1 week
paths:
- build-release-clang-cpp11-qt5.9.0/
- artifacts
test-gcc-c++11-Qt5:
stage:
......@@ -75,8 +79,8 @@ test-gcc-c++11-Qt5:
COMPILER: "gcc"
LANGUAGE: "C++11"
QTVERSION: "QT5"
GIT_SUBMODULE_STRATEGY: recursive
script: "CI/ci-linux-test.sh"
GIT_STRATEGY: none
script: "artifacts/CI/ci-linux-test.sh"
tags:
- Linux
dependencies:
......@@ -92,8 +96,8 @@ test-gcc-c++11-Qt5.9.0:
COMPILER: "gcc"
LANGUAGE: "C++11"
QTVERSION: "QT5.9.0"
GIT_SUBMODULE_STRATEGY: recursive
script: "CI/ci-linux-test.sh"
GIT_STRATEGY: none
script: "artifacts/CI/ci-linux-test.sh"
tags:
- Linux
dependencies:
......@@ -109,8 +113,8 @@ test-clang-c++11-Qt5:
COMPILER: "clang"
LANGUAGE: "C++11"
QTVERSION: "QT5"
GIT_SUBMODULE_STRATEGY: recursive
script: "CI/ci-linux-test.sh"
GIT_STRATEGY: none
script: "artifacts/CI/ci-linux-test.sh"
tags:
- Linux
- MultiThreads
......@@ -127,8 +131,8 @@ test-clang-c++11-Qt5.9.0:
COMPILER: "clang"
LANGUAGE: "C++11"
QTVERSION: "QT5.9.0"
GIT_SUBMODULE_STRATEGY: recursive
script: "CI/ci-linux-test.sh"
GIT_STRATEGY: none
script: "artifacts/CI/ci-linux-test.sh"
tags:
- Linux
- MultiThreads
......@@ -141,13 +145,14 @@ test-clang-c++11-Qt5.9.0:
cppcheck:
stage:
Test
script: "CI/ci-cppcheck.sh"
script: "artifacts/CI/ci-cppcheck.sh"
variables:
GIT_SUBMODULE_STRATEGY: recursive
tags:
- Linux
- MultiThreads
dependencies:
- gcc-c++11-Qt5
artifacts:
paths:
- cppcheck.log
......@@ -165,8 +170,9 @@ VS2015-Qt-5.6.2-x64:
- VS2015
- Qt56
artifacts:
expire_in: 1 week
paths:
- rel/
- artifacts
VS2015-Qt-5.6.2-x32:
stage:
......@@ -181,8 +187,9 @@ VS2015-Qt-5.6.2-x32:
- VS2015
- Qt56
artifacts:
expire_in: 1 week
paths:
- rel/
- artifacts
VS2015-Qt-5.9.0-x64:
stage:
......@@ -196,8 +203,9 @@ VS2015-Qt-5.9.0-x64:
tags:
- VS2015
artifacts:
expire_in: 1 week
paths:
- rel/
- artifacts
VS2015-Qt-5.9.0-x32:
stage:
......@@ -211,8 +219,9 @@ VS2015-Qt-5.9.0-x32:
tags:
- VS2015
artifacts:
expire_in: 1 week
paths:
- rel/
- artifacts
VS2013-Qt-5.5.1-x64:
stage:
......@@ -227,17 +236,20 @@ VS2013-Qt-5.5.1-x64:
- VS2013
- Qt551
artifacts:
expire_in: 1 week
paths:
- rel/
- artifacts
Test:VS2015-Qt-5.6.2-x64:
stage:
Test
script: "CI\\ci-windows-test.bat"
script: "artifacts\\CI\\ci-windows-bootstrap.bat"
variables:
GIT_SUBMODULE_STRATEGY: recursive
GIT_STRATEGY: none
ARCHITECTURE: "x64"
QT_VERSION: "Qt5.6.2"
COMPILER: "VS2015"
STAGE2SCRIPT: ci-windows-test.bat
tags:
- VS2015
- Qt56
......@@ -250,12 +262,13 @@ Test:VS2015-Qt-5.6.2-x64:
Test:VS2015-Qt-5.6.2-x32:
stage:
Test
script: "CI\\ci-windows-test.bat"
script: "artifacts\\CI\\ci-windows-bootstrap.bat"
variables:
GIT_SUBMODULE_STRATEGY: recursive
GIT_STRATEGY: none
ARCHITECTURE: "x32"
QT_VERSION: "Qt5.6.2"
COMPILER: "VS2015"
STAGE2SCRIPT: ci-windows-test.bat
tags:
- VS2015
- Qt56
......@@ -268,12 +281,13 @@ Test:VS2015-Qt-5.6.2-x32:
Test:VS2015-Qt-5.9.0-x64:
stage:
Test
script: "CI\\ci-windows-test.bat"
script: "artifacts\\CI\\ci-windows-bootstrap.bat"
variables:
GIT_SUBMODULE_STRATEGY: recursive
GIT_STRATEGY: none
ARCHITECTURE: "x64"
QT_VERSION: "Qt5.9.0"
COMPILER: "VS2015"
STAGE2SCRIPT: ci-windows-test.bat
tags:
- VS2015
dependencies:
......@@ -285,12 +299,13 @@ Test:VS2015-Qt-5.9.0-x64:
Test:VS2015-Qt-5.9.0-x32:
stage:
Test
script: "CI\\ci-windows-test.bat"
script: "artifacts\\CI\\ci-windows-bootstrap.bat"
variables:
GIT_SUBMODULE_STRATEGY: recursive
GIT_STRATEGY: none
ARCHITECTURE: "x32"
QT_VERSION: "Qt5.9.0"
COMPILER: "VS2015"
STAGE2SCRIPT: ci-windows-test.bat
tags:
- VS2015
dependencies:
......@@ -302,12 +317,13 @@ Test:VS2015-Qt-5.9.0-x32:
Test:VS2013-Qt-5.5.1-x64:
stage:
Test
script: "CI\\ci-windows-test.bat"
script: "artifacts\\CI\\ci-windows-bootstrap.bat"
variables:
GIT_SUBMODULE_STRATEGY: recursive
GIT_STRATEGY: none
ARCHITECTURE: "x64"
QT_VERSION: "Qt5.5.1"
COMPILER: "VS2013"
STAGE2SCRIPT: ci-windows-test.bat
tags:
- VS2013
- Qt551
......@@ -323,12 +339,13 @@ Deploy:VS2015-Qt-5.6.2-x64:
only:
- master
- unstable
script: "CI\\ci-windows-deploy.bat"
script: "artifacts\\CI\\ci-windows-bootstrap.bat"
variables:
GIT_SUBMODULE_STRATEGY: recursive
GIT_STRATEGY: none
ARCHITECTURE: "x64"
QT_VERSION: "Qt5.6.2"
COMPILER: "VS2015"
STAGE2SCRIPT: ci-windows-deploy.bat
tags:
- VS2015
- Qt56
......@@ -344,12 +361,13 @@ Deploy:VS2015-Qt-5.6.2-x32:
only:
- master
- unstable
script: "CI\\ci-windows-deploy.bat"
script: "artifacts\\CI\\ci-windows-bootstrap.bat"
variables:
GIT_SUBMODULE_STRATEGY: recursive
GIT_STRATEGY: none
ARCHITECTURE: "x32"
QT_VERSION: "Qt5.6.2"
COMPILER: "VS2015"
STAGE2SCRIPT: ci-windows-deploy.bat
tags:
- VS2015
- Qt56
......@@ -365,12 +383,13 @@ Deploy:VS2015-Qt-5.9.0-x64:
only:
- master
- unstable
script: "CI\\ci-windows-deploy.bat"
script: "artifacts\\CI\\ci-windows-bootstrap.bat"
variables:
GIT_SUBMODULE_STRATEGY: recursive
GIT_STRATEGY: none
ARCHITECTURE: "x64"
QT_VERSION: "Qt5.9.0"
COMPILER: "VS2015"
STAGE2SCRIPT: ci-windows-deploy.bat
tags:
- VS2015
dependencies:
......@@ -385,12 +404,13 @@ Deploy:VS2015-Qt-5.9.0-x32:
only:
- master
- unstable
script: "CI\\ci-windows-deploy.bat"
script: "artifacts\\CI\\ci-windows-bootstrap.bat"
variables:
GIT_SUBMODULE_STRATEGY: recursive
GIT_STRATEGY: none
ARCHITECTURE: "x32"
QT_VERSION: "Qt5.9.0"
COMPILER: "VS2015"
STAGE2SCRIPT: ci-windows-deploy.bat
tags:
- VS2015
dependencies:
......@@ -405,12 +425,13 @@ Deploy:VS2013-Qt-5.5.1-x64:
only:
- master
- unstable
script: "CI\\ci-windows-deploy.bat"
script: "artifacts\\CI\\ci-windows-bootstrap.bat"
variables:
GIT_SUBMODULE_STRATEGY: recursive
GIT_STRATEGY: none
ARCHITECTURE: "x64"
QT_VERSION: "Qt5.5.1"
COMPILER: "VS2013"
STAGE2SCRIPT: ci-windows-deploy.bat
tags:
- VS2013
- Qt551
......@@ -429,15 +450,16 @@ Mac-Cpp11:
tags:
- Apple
artifacts:
expire_in: 1 week
paths:
- build-release/
- artifacts
Test:Mac-Cpp11:
stage:
Test
script: "CI/ci-mac-test.sh"
script: "artifacts/CI/ci-mac-test.sh"
variables:
GIT_SUBMODULE_STRATEGY: recursive
GIT_STRATEGY: none
tags:
- Apple
dependencies:
......@@ -452,9 +474,9 @@ Deploy:Mac-Cpp11:
only:
- master
- unstable
script: "CI/ci-mac-deploy.sh"
script: "artifacts/CI/ci-mac-deploy.sh"
variables:
GIT_SUBMODULE_STRATEGY: recursive
GIT_STRATEGY: none
tags:
- Apple
dependencies:
......
......@@ -3,6 +3,9 @@
# Exit script on any error
set -e
#remove artifacts ... they are copied even since they shouldnt be see https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/issues/1917
rm -rf artifacts
#=====================================
# Color Settings:
#=====================================
......
......@@ -41,9 +41,23 @@ make $MAKE_OPTIONS
# copy the used shared libraries to the lib folder
cd Build
mkdir systemlib
if [ ! -d systemlib ]; then
mkdir systemlib
fi
ldd bin/OpenFlipper | grep "=> /" | awk '{print $3}' | xargs -I '{}' cp -v '{}' systemlib
#cd ..
cd ../..
#create an artifact directory
if [ ! -d artifacts ]; then
mkdir artifacts
fi
#cp -R * artifacts
rsync -a --exclude=artifacts --exclude=.git . ./artifacts
cd artifacts
#rm -rf .git
# create an archive with all the build files so we can use them in the test script
#tar -cvf ../buildfiles.tar .
......@@ -8,11 +8,14 @@ set -e
# LANGUAGE= C++98 / C++11
# QTVERSION= QT4/QT5
#include ci options script
MY_DIR=$(dirname $(readlink -f $0))
source $MY_DIR/ci-linux-config.sh
# copy artifact files to toplevel and remove subdirectory
rsync -a $MY_DIR/.. $MY_DIR/../..
rm -rf artifacts
########################################
# Fetch test data
########################################
......
......@@ -20,4 +20,14 @@ cd build-release
make
# Required for the tests to build, if a package was generated
make fixbundle
\ No newline at end of file
make fixbundle
cd ..
#create an artifact directory
if [ ! -d artifacts ]; then
mkdir artifacts
fi
#cp -R * artifacts
rsync -a --exclude=artifacts --exclude=.git . ./artifacts
\ No newline at end of file
# leave artifacts subdirectory and copy files to toplevel
rsync -a ./artifacts ./
rm -rf artifacts
########################################
# Fetch test data
......
# leave artifacts subdirectory and copy files to toplevel
rsync -a ./artifacts ./
rm -rf artifacts
########################################
# Fetch test data
########################################
......
@echo off
REM bootstrapping script for stage 2 ci scripts
REM to avoid repetitive cloning, in lieu of the sgitlab tickyrunners
REM we copy the entire content of our bild folder to an artifacts subdolder
REM and share it with other buildstages.
REM
REM initial building is considered as stage 0,this script is stage 1 all
REM following stages are stage 2. The purpos of this script is to move all
REM files from the artifacts directory back to the root directory and call
REM the script for this ci job.
REM This way the stage 2 script can delete the artifacts folder safely, as
REM deleting a script that is running will cause an error on windows systems.
REM
REM #######################################
REM # bootstrap level 0
REM #######################################
IF "%BOOTSTRAPLEVEL%" == "" (
set BOOTSTRAPLEVEL=0
)
IF "%BOOTSTRAPLEVEL%" == "0" (
REM copy all files from artifacts folder to root folder
echo %TIME%: Restoring artifacts from artifacts directory ...
robocopy artifacts ./ /e /NFL /NDL /NJH /NJS /nc /ns /np
REM set the bootstrap level to 1
echo %TIME%: Entering bootstrap level 1 ...
set BOOTSTRAPLEVEL=1
REM call the copy of this script outside artifacts folder
call %~dp0\..\..\CI\ci-windows-bootstrap.bat
REM return the error code if not 0
IF "%errorlevel%" NEQ "0" exit /b %errorlevel%
) else (
REM #######################################
REM # bootstrap level 1
REM #######################################
REM remove the artifacts folder, it may cause problems with e.g. cmake
echo %Time%: Removing artifacts directory ...
rmdir /Q /S artifacts
REM call the stage 2 script
echo %Time%: Calling %~dp0\%STAGE2SCRIPT% ...
call %~dp0\%STAGE2SCRIPT%
REM store the error code of the stage 2 script
set bootstrapretval=%errorlevel%
REM copy this script back to the artifacts folder
if not exist ./artifacts (
echo %Time%: recrerating artifacts directory ...
cd %~dp0\..
mkdir artifacts
cd artifacts
mkdir CI
cd ..
)
echo %Time%: restoring bootstrap script ...
cp %~dp0\ci-windows-bootstrap.bat artifacts/CI/ci-windows-bootstrap.bat
REM when this script returns, the windows Command interpreter will look
REM at the original position for the script to continue after the the call command
REM of level 0
IF "%bootstrapretval%" NEQ "0" exit /b %bootstrapretval%
)
\ No newline at end of file
......@@ -26,3 +26,13 @@ IF %errorlevel% NEQ 0 exit /b %errorlevel%
%VS_PATH% /Build "Release" OpenFlipper.sln /Project "ALL_BUILD"
IF %errorlevel% NEQ 0 exit /b %errorlevel%
:: back to the root folder
cd ..
:: copy all files to a new artifacts folder except the .git folder
:: use the following options to make robocopy silent /NFL /NDL /NJH /NJS /nc /ns /np
robocopy . artifacts /e /NFL /NDL /NJH /NJS /nc /ns /np /xd artifacts /xd .git
::robocopy uses some error codes different from 0
IF %errorlevel% LSS 8 exit /b 0
\ No newline at end of file
@echo off
::########################################
::# Fetch test data
::########################################
......@@ -10,15 +11,20 @@ git clone git@roosevelt.informatik.rwth-aachen.de:moebius/OpenFlipper-Test-Data.
::load configuration and settings
call %~dp0\ci-windows-config.bat
echo %Time%: Entering rel directory ...
::enter build directory
cd rel
echo %Time%: Removing CMakeCache ...
::delete cmake cache
del /s /q CMakeCache.txt
echo %Time%: Removing CTestFile ...
del /q CTestTestfile.cmake
echo %Time%: Removing DartConfiguration ...
del /q DartConfiguration.tcl
echo %Time%: running cmake ...
::invoke cmake to fix paths
"C:\Program Files\CMake\bin\cmake.exe" -DGTEST_PREFIX="%LIBPATH_BASE%\%ARCHITECTURE%\%GTESTVERSION%" -G "%GENERATOR%" -DCMAKE_BUILD_TYPE=Release -DOPENFLIPPER_BUILD_UNIT_TESTS=TRUE %CMAKE_CONFIGURATION% ..
......
......@@ -154,7 +154,8 @@ copy ..\Build\Qt*.dll testBinaries
copy ..\Build\icu*.dll testBinaries
run_tests.bat
IF %errorlevel% NEQ 0 exit /b %errorlevel%
::robocopy uses some error codes different from 0
IF %errorlevel% LSS 8 exit /b 0
cd ..
......
......@@ -414,6 +414,7 @@ set (PREFOUND_PACKAGES "${LOADED_PACKAGES}" CACHE INTERNAL "List of packages tha
# ========================================================================
add_subdirectory (OpenFlipper/CoreApp)
GROUP_PROJECT(${OPENFLIPPER_PRODUCT_STRING} ${OPENFLIPPER_PRODUCT_STRING})
# ========================================================================
......
Subproject commit 29aa322efed8eea4f5b4cfb00fa389afd55e9ba6
Subproject commit de30cd77280f8238d4b870c4718ed0bccf16e4a3
Subproject commit 8d4621b9366cfabb3216dc27bf23f3d3e1aed401
Subproject commit a9a7989cb97aa183bbec0781894e1d5caac35e1a
Subproject commit 68a1a25a4cf690235a8384ff95773e212b0319dc
Subproject commit e83e98b5bf6d57468002612091c4c74734c24f28
Subproject commit 755b04d89f047e3e3f0f4dc5d1082d10fb4278f3
Subproject commit 0a0b7e73dc410aefbf7678ab0d69b16a4fa8e170
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