From 2cfa5618c73de6f21411ada9b2155ff4f3744c6a Mon Sep 17 00:00:00 2001 From: Fabian Lennartz <lennartz@vr.rwth-aachen.de> Date: Thu, 28 Jun 2018 09:26:20 +0200 Subject: [PATCH] Enable Windows CI Integration tests with our Windows CI #236 --- .gitlab-ci.yml | 310 ++++++++++++++++++++++++------------------------- 1 file changed, 155 insertions(+), 155 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a3ff39c3..8b40838f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -32,86 +32,86 @@ stages: # common builds -# conan:windows:msvc++14.1: - # stage: conan - # except: - # - schedules - # tags: - # - msvc++14.1 - # - opengl - # script: - # - rmdir /s /q build - # - mkdir build - # - cd build - # - conan install --build=missing -s compiler="Visual Studio" -s compiler.version=15 -s build_type=Release -s compiler.runtime=MD .. - # artifacts: - # paths: - # - build - # expire_in: 1 week +conan:windows:msvc++14.1: + stage: conan + except: + - schedules + tags: + - msvc++14.1 + - opengl + script: + - rmdir /s /q build + - mkdir build + - cd build + - conan install --build=missing -s compiler="Visual Studio" -s compiler.version=15 -s build_type=Release -s compiler.runtime=MD .. + artifacts: + paths: + - build + expire_in: 1 week -# cmake:windows:msvc++14.1: - # stage: cmake - # except: - # - schedules - # tags: - # - msvc++14.1 - # - opengl - # dependencies: - # - conan:windows:msvc++14.1 - # script: - # - cd build - # - cmake -G "Visual Studio 15 2017 Win64" -DIS_BUILD_SERVER:BOOL=TRUE .. - # artifacts: - # untracked: true - # paths: - # - build - # expire_in: 1 week +cmake:windows:msvc++14.1: + stage: cmake + except: + - schedules + tags: + - msvc++14.1 + - opengl + dependencies: + - conan:windows:msvc++14.1 + script: + - cd build + - cmake -G "Visual Studio 15 2017 Win64" -DIS_BUILD_SERVER:BOOL=TRUE .. + artifacts: + untracked: true + paths: + - build + expire_in: 1 week -# build:windows:msvc++14.1: - # stage: build - # except: - # - schedules - # tags: - # - msvc++14.1 - # - opengl - # dependencies: - # - cmake:windows:msvc++14.1 - # script: - # - cd build - # - cmake --build . --config Release --target Cpplint-Test-Suite - # - cmake --build . --config Release --target Cppcheck-Test-Suite - # - cmake --build . --config Release -- /m /verbosity:minimal - # artifacts: - # paths: - # - build - # expire_in: 1 week - # allow_failure: true +build:windows:msvc++14.1: + stage: build + except: + - schedules + tags: + - msvc++14.1 + - opengl + dependencies: + - cmake:windows:msvc++14.1 + script: + - cd build + - cmake --build . --config Release --target Cpplint-Test-Suite + - cmake --build . --config Release --target Cppcheck-Test-Suite + - cmake --build . --config Release -- /m /verbosity:minimal + artifacts: + paths: + - build + expire_in: 1 week + allow_failure: true -# unit_test:windows:msvc++14.1: - # stage: test - # except: - # - schedules - # tags: - # - msvc++14.1 - # - opengl - # dependencies: - # - build:windows:msvc++14.1 - # script: - # - cd build - # - cmake --build . --config Release --target Unit-Test-Suite +unit_test:windows:msvc++14.1: + stage: test + except: + - schedules + tags: + - msvc++14.1 + - opengl + dependencies: + - build:windows:msvc++14.1 + script: + - cd build + - cmake --build . --config Release --target Unit-Test-Suite -# integration_test:windows:msvc++14.1: - # stage: test - # except: - # - schedules - # tags: - # - msvc++14.1 - # - opengl - # dependencies: - # - build:windows:msvc++14.1 - # script: - # - cd build - # - cmake --build . --config Release --target Integration-Test-Suite +integration_test:windows:msvc++14.1: + stage: test + except: + - schedules + tags: + - msvc++14.1 + - opengl + dependencies: + - build:windows:msvc++14.1 + script: + - cd build + - cmake --build . --config Release --target Integration-Test-Suite # nightly builds @@ -393,23 +393,23 @@ stages: # common builds -conan:linux:gcc5.3.1: - stage: conan - except: - - schedules - tags: - - gcc5.3.1 - - opengl - script: - - mkdir build - - cd build - - export CC=gcc - - export CXX=g++ - - conan install .. --build=missing -s compiler="gcc" -s compiler.version="5.3" -s compiler.libcxx="libstdc++11" -s build_type=Release - artifacts: - paths: - - build - expire_in: 1 week +# conan:linux:gcc5.3.1: + # stage: conan + # except: + # - schedules + # tags: + # - gcc5.3.1 + # - opengl + # script: + # - mkdir build + # - cd build + # - export CC=gcc + # - export CXX=g++ + # - conan install .. --build=missing -s compiler="gcc" -s compiler.version="5.3" -s compiler.libcxx="libstdc++11" -s build_type=Release + # artifacts: + # paths: + # - build + # expire_in: 1 week # conan:linux:gcc6.3.1: # stage: conan @@ -429,23 +429,23 @@ conan:linux:gcc5.3.1: # - build # expire_in: 1 week -cmake:linux:gcc5.3.1: - stage: cmake - except: - - schedules - tags: - - gcc5.3.1 - - opengl - dependencies: - - conan:linux:gcc5.3.1 - script: - - cd build - - cmake .. -DIS_BUILD_SERVER:BOOL=TRUE -DCMAKE_BUILD_TYPE=Release - artifacts: - untracked: true - paths: - - build - expire_in: 1 week +# cmake:linux:gcc5.3.1: + # stage: cmake + # except: + # - schedules + # tags: + # - gcc5.3.1 + # - opengl + # dependencies: + # - conan:linux:gcc5.3.1 + # script: + # - cd build + # - cmake .. -DIS_BUILD_SERVER:BOOL=TRUE -DCMAKE_BUILD_TYPE=Release + # artifacts: + # untracked: true + # paths: + # - build + # expire_in: 1 week # cmake:linux:gcc6.3.1: # stage: cmake @@ -465,25 +465,25 @@ cmake:linux:gcc5.3.1: # - build # expire_in: 1 week -build:linux:gcc5.3.1: - stage: build - except: - - schedules - tags: - - gcc5.3.1 - - opengl - dependencies: - - cmake:linux:gcc5.3.1 - script: - - cd build - - make Cpplint-Test-Suite - - make Cppcheck-Test-Suite - - make -j8 - artifacts: - paths: - - build - expire_in: 1 week - allow_failure: true +# build:linux:gcc5.3.1: + # stage: build + # except: + # - schedules + # tags: + # - gcc5.3.1 + # - opengl + # dependencies: + # - cmake:linux:gcc5.3.1 + # script: + # - cd build + # - make Cpplint-Test-Suite + # - make Cppcheck-Test-Suite + # - make -j8 + # artifacts: + # paths: + # - build + # expire_in: 1 week + # allow_failure: true # build:linux:gcc6.3.1: # stage: build @@ -505,18 +505,18 @@ build:linux:gcc5.3.1: # expire_in: 1 week # allow_failure: true -unit_test:linux:gcc5.3.1: - stage: test - except: - - schedules - tags: - - gcc5.3.1 - - opengl - dependencies: - - build:linux:gcc5.3.1 - script: - - cd build - - make Unit-Test-Suite +# unit_test:linux:gcc5.3.1: + # stage: test + # except: + # - schedules + # tags: + # - gcc5.3.1 + # - opengl + # dependencies: + # - build:linux:gcc5.3.1 + # script: + # - cd build + # - make Unit-Test-Suite # test:linux:gcc6.3.1: # stage: test @@ -531,20 +531,20 @@ unit_test:linux:gcc5.3.1: # - cd build # - make Unit-Test-Suite -integration_test:linux:gcc5.3.1: - stage: test - except: - - schedules - tags: - - gcc5.3.1 - - opengl - dependencies: - - build:linux:gcc5.3.1 - script: - - cd build - - DISPLAY=:0 ; export DISPLAY - - echo $DISPLAY - - make Integration-Test-Suite +# integration_test:linux:gcc5.3.1: + # stage: test + # except: + # - schedules + # tags: + # - gcc5.3.1 + # - opengl + # dependencies: + # - build:linux:gcc5.3.1 + # script: + # - cd build + # - DISPLAY=:0 ; export DISPLAY + # - echo $DISPLAY + # - make Integration-Test-Suite # nightly builds -- GitLab