From 3b61fd197ad3f0e5be976ead1c7fb724fd317c19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Thu, 24 May 2018 08:53:49 +0200 Subject: [PATCH] Revert "Merge branch 'featureCIYamlAnchors' into 'master'" This reverts commit c091dd11d8ba2e0a8f534dd896ccff1977da526f, reversing changes made to 9a04fd8b2b25e0484c66cfbb34520176b972ff60. --- .gitlab-ci.yml | 435 +++++++++++++++++++++++++++++++------------------ 1 file changed, 272 insertions(+), 163 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6ef81b27..95d8d1d6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,120 +1,22 @@ -### Templates for common job definitions ### -.LINUX_TAG: &LINUX_TAG +gcc-c++11: + script: "CI/ci-linux.sh gcc C++11" tags: - Linux -### VS2017 ### - -.VS2017_64_TEMPLATE: &VS2017_x64 - variables: - BUILD_PLATFORM: "VS2017" - ARCHITECTURE: "x64" - script: "CI\\Windows.bat" - artifacts: - paths: - - build-release/*.exe - tags: - - VS2017 - - Qt5101 - -.VS2017_32_TEMPLATE: &VS2017_x32 - variables: - BUILD_PLATFORM: "VS2017" - ARCHITECTURE: "x32" - script: "CI\\Windows.bat" - tags: - - VS2017 - artifacts: - paths: - - build-release/*.exe - -### VS2015 ### - -.VS2015_64_TEMPLATE: &VS2015_x64 - variables: - BUILD_PLATFORM: "VS2015" - ARCHITECTURE: "x64" - script: "CI\\Windows.bat" - tags: - - VS2015 - artifacts: - paths: - - build-release/*.exe - -.VS2015_32_TEMPLATE: &VS2015_x32 - variables: - BUILD_PLATFORM: "VS2015" - ARCHITECTURE: "x32" - script: "CI\\Windows.bat" - tags: - - VS2015 - artifacts: - paths: - - build-release/*.exe - -### VS2013 ### - -.VS2013_64_TEMPLATE: &VS2013_x64 - variables: - BUILD_PLATFORM: "VS2013" - ARCHITECTURE: "x64" - script: "CI\\Windows.bat" - tags: - - VS2013 - artifacts: - paths: - - build-release/*.exe - -.VS2013_32_TEMPLATE: &VS2013_x32 - variables: - BUILD_PLATFORM: "VS2013" - ARCHITECTURE: "x32" - script: "CI\\Windows.bat" - tags: - - VS2013 - artifacts: - paths: - - build-release/*.exe - -### Linker and App configurations for VS ### - -.STATIC_NO_APPS: &STATIC_NO_APPS - variables: - SHARED: "FALSE" - APPS: "OFF" - -.STATIC_APPS: &STATIC_APPS - variables: - SHARED: "FLASE" - APPS: "ON" - -.SHARED_NO_APPS: &SHARED_NO_APPS - variables: - SHARED: "TRUE" - APPS: "OFF" - -.SHARED_APPS: &SHARED_APPS - variables: - SHARED: "TRUE" - APPS: "ON" - -### actual job definitions ### - -gcc-c++11: - script: "CI/ci-linux.sh gcc C++11" - <<: *LINUX_TAG - clang-c++11: script: "CI/ci-linux.sh clang C++11" - <<: *LINUX_TAG + tags: + - Linux gcc-c++14: script: "CI/ci-linux.sh gcc C++14" - <<: *LINUX_TAG + tags: + - Linux clang-c++14: script: "CI/ci-linux.sh clang C++14" - <<: *LINUX_TAG + tags: + - Linux macos-c++11: script: "CI/ci-mac.sh C++11" @@ -141,94 +43,301 @@ cppcheck: artifacts: paths: - cppcheck.log - + VS2017-64-bit-shared-apps: - variables: *SHARED_APPS - <<: *VS2017_x64 - + variables: + BUILD_PLATFORM: "VS2017" + ARCHITECTURE: "x64" + SHARED: "TRUE" + APPS: "ON" + script: "CI\\Windows.bat" + tags: + - VS2017 + - Qt5101 + artifacts: + paths: + - build-release/*.exe + VS2017-64-bit-static-apps: - variables: *STATIC_APPS - <<: *VS2017_x64 + variables: + BUILD_PLATFORM: "VS2017" + ARCHITECTURE: "x64" + SHARED: "FALSE" + APPS: "ON" + script: "CI\\Windows.bat" + tags: + - VS2017 + - Qt5101 + artifacts: + paths: + - build-release/*.exe + VS2017-64-bit-shared-no-apps: - variables: *SHARED_NO_APPS - <<: *VS2017_x64 + variables: + BUILD_PLATFORM: "VS2017" + ARCHITECTURE: "x64" + SHARED: "TRUE" + APPS: "OFF" + script: "CI\\Windows.bat" + tags: + - VS2017 + artifacts: + paths: + - build-release/*.exe -VS2017-64-bit-static-no-apps: - variables: *STATIC_NO_APPS - <<: *VS2017_x64 VS2017-32-bit-shared-no-apps: - variables: *SHARED_NO_APPS - <<: *VS2017_x32 + variables: + BUILD_PLATFORM: "VS2017" + ARCHITECTURE: "x32" + SHARED: "TRUE" + APPS: "OFF" + script: "CI\\Windows.bat" + tags: + - VS2017 + artifacts: + paths: + - build-release/*.exe + + +VS2017-64-bit-static-no-apps: + variables: + BUILD_PLATFORM: "VS2017" + ARCHITECTURE: "x64" + SHARED: "FALSE" + APPS: "OFF" + script: "CI\\Windows.bat" + tags: + - VS2017 + artifacts: + paths: + - build-release/*.exe + VS2017-32-bit-static-no-apps: - variables: *STATIC_NO_APPS - <<: *VS2017_x32 + variables: + BUILD_PLATFORM: "VS2017" + ARCHITECTURE: "x32" + SHARED: "FALSE" + APPS: "OFF" + script: "CI\\Windows.bat" + tags: + - VS2017 + artifacts: + paths: + - build-release/*.exe VS2015-64-bit-shared-apps: - variables: *SHARED_APPS - <<: *VS2015_x64 - + variables: + BUILD_PLATFORM: "VS2015" + ARCHITECTURE: "x64" + SHARED: "TRUE" + APPS: "ON" + script: "CI\\Windows.bat" + tags: + - VS2015 + artifacts: + paths: + - build-release/*.exe + + VS2015-64-bit-shared-no-apps: - variables: *SHARED_NO_APPS - <<: *VS2015_x64 - -VS2015-64-bit-static-apps: - variables: *STATIC_APPS - <<: *VS2015_x64 - -VS2015-64-bit-static-no-apps: - variables: *STATIC_NO_APPS - <<: *VS2015_x64 + variables: + BUILD_PLATFORM: "VS2015" + ARCHITECTURE: "x64" + SHARED: "TRUE" + APPS: "OFF" + script: "CI\\Windows.bat" + tags: + - VS2015 + artifacts: + paths: + - build-release/*.exe VS2015-32-bit-shared-apps: - variables: *SHARED_APPS - <<: *VS2015_x32 + variables: + BUILD_PLATFORM: "VS2015" + ARCHITECTURE: "x32" + SHARED: "TRUE" + APPS: "ON" + script: "CI\\Windows.bat" + tags: + - VS2015 + artifacts: + paths: + - build-release/*.exe VS2015-32-bit-shared-no-apps: - variables: *SHARED_NO_APPS - <<: *VS2015_x32 + variables: + BUILD_PLATFORM: "VS2015" + ARCHITECTURE: "x32" + SHARED: "TRUE" + APPS: "OFF" + script: "CI\\Windows.bat" + tags: + - VS2015 + artifacts: + paths: + - build-release/*.exe + +VS2015-64-bit-static-apps: + variables: + BUILD_PLATFORM: "VS2015" + ARCHITECTURE: "x64" + SHARED: "FALSE" + APPS: "ON" + script: "CI\\Windows.bat" + tags: + - VS2015 + artifacts: + paths: + - build-release/*.exe + +VS2015-64-bit-static-no-apps: + variables: + BUILD_PLATFORM: "VS2015" + ARCHITECTURE: "x64" + SHARED: "FALSE" + APPS: "OFF" + script: "CI\\Windows.bat" + tags: + - VS2015 + artifacts: + paths: + - build-release/*.exe VS2015-32-bit-static-apps: - variables: *STATIC_APPS - <<: *VS2015_x32 + variables: + BUILD_PLATFORM: "VS2015" + ARCHITECTURE: "x32" + SHARED: "FALSE" + APPS: "ON" + script: "CI\\Windows.bat" + tags: + - VS2015 + artifacts: + paths: + - build-release/*.exe VS2015-32-bit-static-no-apps: - variables: *STATIC_NO_APPS - <<: *VS2015_x32 - + variables: + BUILD_PLATFORM: "VS2015" + ARCHITECTURE: "x32" + SHARED: "FALSE" + APPS: "OFF" + script: "CI\\Windows.bat" + tags: + - VS2015 + artifacts: + paths: + - build-release/*.exe + + + VS2013-64-bit-shared-apps: - variables: *SHARED_APPS - <<: *VS2013_x64 + variables: + BUILD_PLATFORM: "VS2013" + ARCHITECTURE: "x64" + SHARED: "TRUE" + APPS: "ON" + script: "CI\\Windows.bat" + tags: + - VS2013 + artifacts: + paths: + - build-release/*.exe VS2013-64-bit-shared-no-apps: - variables: *SHARED_NO_APPS - <<: *VS2013_x64 - -VS2013-64-bit-static-apps: - variables: *STATIC_APPS - <<: *VS2013_x64 - -VS2013-64-bit-static-no-apps: - variables: *STATIC_NO_APPS - <<: *VS2013_x64 + variables: + BUILD_PLATFORM: "VS2013" + ARCHITECTURE: "x64" + SHARED: "TRUE" + APPS: "OFF" + script: "CI\\Windows.bat" + tags: + - VS2013 + artifacts: + paths: + - build-release/*.exe VS2013-32-bit-shared-apps: - variables: *SHARED_APPS - <<: *VS2013_x32 + variables: + BUILD_PLATFORM: "VS2013" + ARCHITECTURE: "x32" + SHARED: "TRUE" + APPS: "ON" + script: "CI\\Windows.bat" + tags: + - VS2013 + artifacts: + paths: + - build-release/*.exe VS2013-32-bit-shared-no-apps: - variables: *SHARED_NO_APPS - <<: *VS2013_x32 + variables: + BUILD_PLATFORM: "VS2013" + ARCHITECTURE: "x32" + SHARED: "TRUE" + APPS: "OFF" + script: "CI\\Windows.bat" + tags: + - VS2013 + artifacts: + paths: + - build-release/*.exe + +VS2013-64-bit-static-apps: + variables: + BUILD_PLATFORM: "VS2013" + ARCHITECTURE: "x64" + SHARED: "FALSE" + APPS: "ON" + script: "CI\\Windows.bat" + tags: + - VS2013 + artifacts: + paths: + - build-release/*.exe + +VS2013-64-bit-static-no-apps: + variables: + BUILD_PLATFORM: "VS2013" + ARCHITECTURE: "x64" + SHARED: "FALSE" + APPS: "OFF" + script: "CI\\Windows.bat" + tags: + - VS2013 + artifacts: + paths: + - build-release/*.exe VS2013-32-bit-static-apps: - variables: *STATIC_APPS - <<: *VS2013_x32 + variables: + BUILD_PLATFORM: "VS2013" + ARCHITECTURE: "x32" + SHARED: "FALSE" + APPS: "ON" + script: "CI\\Windows.bat" + tags: + - VS2013 + artifacts: + paths: + - build-release/*.exe VS2013-32-bit-static-no-apps: - variables: *STATIC_NO_APPS - <<: *VS2013_x32 + variables: + BUILD_PLATFORM: "VS2013" + ARCHITECTURE: "x32" + SHARED: "FALSE" + APPS: "OFF" + script: "CI\\Windows.bat" + tags: + - VS2013 + artifacts: + paths: + - build-release/*.exe Doc-publish: only: