Commit 4895a064 authored by Martin Schultz's avatar Martin Schultz

fixed paths for windows

remove artifacts for cppcheck
parent e29e1404
Pipeline #5565 failed with stages
in 73 minutes and 20 seconds
......@@ -172,6 +172,7 @@ VS2015-Qt-5.6.2-x64:
expire_in: 1 week
paths:
- artifacts
- CI
VS2015-Qt-5.6.2-x32:
stage:
......@@ -189,6 +190,7 @@ VS2015-Qt-5.6.2-x32:
expire_in: 1 week
paths:
- artifacts
- CI
VS2015-Qt-5.9.0-x64:
stage:
......@@ -205,6 +207,7 @@ VS2015-Qt-5.9.0-x64:
expire_in: 1 week
paths:
- artifacts
- CI
VS2015-Qt-5.9.0-x32:
stage:
......@@ -221,6 +224,7 @@ VS2015-Qt-5.9.0-x32:
expire_in: 1 week
paths:
- artifacts
- CI
VS2013-Qt-5.5.1-x64:
stage:
......@@ -238,6 +242,7 @@ VS2013-Qt-5.5.1-x64:
expire_in: 1 week
paths:
- artifacts
- CI
Test:VS2015-Qt-5.6.2-x64:
stage:
......@@ -260,7 +265,7 @@ Test:VS2015-Qt-5.6.2-x64:
Test:VS2015-Qt-5.6.2-x32:
stage:
Test
script: "artifacts\\CI\\ci-windows-test.bat"
script: "CI\\ci-windows-test.bat"
variables:
GIT_STRATEGY: none
ARCHITECTURE: "x32"
......@@ -278,7 +283,7 @@ Test:VS2015-Qt-5.6.2-x32:
Test:VS2015-Qt-5.9.0-x64:
stage:
Test
script: "artifacts\\CI\\ci-windows-test.bat"
script: "CI\\ci-windows-test.bat"
variables:
GIT_STRATEGY: none
ARCHITECTURE: "x64"
......@@ -295,7 +300,7 @@ Test:VS2015-Qt-5.9.0-x64:
Test:VS2015-Qt-5.9.0-x32:
stage:
Test
script: "artifacts\\CI\\ci-windows-test.bat"
script: "CI\\ci-windows-test.bat"
variables:
GIT_STRATEGY: none
ARCHITECTURE: "x32"
......@@ -312,7 +317,7 @@ Test:VS2015-Qt-5.9.0-x32:
Test:VS2013-Qt-5.5.1-x64:
stage:
Test
script: "artifacts\\CI\\ci-windows-test.bat"
script: "CI\\ci-windows-test.bat"
variables:
GIT_STRATEGY: none
ARCHITECTURE: "x64"
......@@ -333,7 +338,7 @@ Deploy:VS2015-Qt-5.6.2-x64:
only:
- master
- unstable
script: "artifacts\\CI\\ci-windows-deploy.bat"
script: "CI\\ci-windows-deploy.bat"
variables:
GIT_STRATEGY: none
ARCHITECTURE: "x64"
......@@ -354,7 +359,7 @@ Deploy:VS2015-Qt-5.6.2-x32:
only:
- master
- unstable
script: "artifacts\\CI\\ci-windows-deploy.bat"
script: "CI\\ci-windows-deploy.bat"
variables:
GIT_STRATEGY: none
ARCHITECTURE: "x32"
......@@ -375,7 +380,7 @@ Deploy:VS2015-Qt-5.9.0-x64:
only:
- master
- unstable
script: "artifacts\\CI\\ci-windows-deploy.bat"
script: "CI\\ci-windows-deploy.bat"
variables:
GIT_STRATEGY: none
ARCHITECTURE: "x64"
......@@ -395,7 +400,7 @@ Deploy:VS2015-Qt-5.9.0-x32:
only:
- master
- unstable
script: "artifacts\\CI\\ci-windows-deploy.bat"
script: "CI\\ci-windows-deploy.bat"
variables:
GIT_STRATEGY: none
ARCHITECTURE: "x32"
......@@ -415,7 +420,7 @@ Deploy:VS2013-Qt-5.5.1-x64:
only:
- master
- unstable
script: "artifacts\\CI\\ci-windows-deploy.bat"
script: "CI\\ci-windows-deploy.bat"
variables:
GIT_STRATEGY: none
ARCHITECTURE: "x64"
......
......@@ -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:
#=====================================
......
......@@ -30,8 +30,8 @@ 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
robocopy . artifacts /e /xd artifacts /xd .git
:: copy all files to a new artifacts folder except the .git folder and CI scripts
robocopy . artifacts /e /xd artifacts /xd .git /xd CI
::robocopy uses some error codes different from 0
IF %errorlevel% LSS 8 exit /b 0
\ No newline at end of file
......@@ -10,6 +10,12 @@ git clone git@roosevelt.informatik.rwth-aachen.de:moebius/OpenFlipper-Test-Data.
::load configuration and settings
call %~dp0\ci-windows-config.bat
:: copy artifact files to toplevel and remove directory
echo %TIME%: Restoring artifacts from artifacts directory ...
robocopy artifacts ./ /e /NFL /NDL /NJH /NJS /nc /ns /np
echo %Time%: Removing artifacts directory ...
rmdir /Q /S artifacts
mkdir rel
cd rel
......
@echo off
:: leave artifacts subdirectory and copy files to toplevel
robocopy artifacts ../ /e /NFL /NDL /NJH /NJS /nc /ns /np
cd ..
rmdir /Q /S artifacts
::########################################
::# Fetch test data
::########################################
......@@ -16,15 +11,26 @@ git clone git@roosevelt.informatik.rwth-aachen.de:moebius/OpenFlipper-Test-Data.
::load configuration and settings
call %~dp0\ci-windows-config.bat
:: copy artifact files to toplevel and remove directory
echo %TIME%: Restoring artifacts from artifacts directory ...
robocopy artifacts ./ /e /NFL /NDL /NJH /NJS /nc /ns /np
echo %Time%: Removing artifacts directory ...
rmdir /Q /S artifacts
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 (x86)\CMake\bin\cmake.exe" -DGTEST_PREFIX="%LIBPATH_BASE%\%ARCHITECTURE%\%GTESTVERSION%" -G "%GENERATOR%" -DCMAKE_BUILD_TYPE=Release -DOPENFLIPPER_BUILD_UNIT_TESTS=TRUE %CMAKE_CONFIGURATION% ..
......
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