Commit 3b61fd19 authored by Jan Möbius's avatar Jan Möbius

Revert "Merge branch 'featureCIYamlAnchors' into 'master'"

This reverts commit c091dd11, reversing
changes made to 9a04fd8b.
parent 82819182
### Templates for common job definitions ### gcc-c++11:
.LINUX_TAG: &LINUX_TAG script: "CI/ci-linux.sh gcc C++11"
tags:
- Linux
clang-c++11:
script: "CI/ci-linux.sh clang C++11"
tags:
- Linux
gcc-c++14:
script: "CI/ci-linux.sh gcc C++14"
tags: tags:
- Linux - Linux
### VS2017 ### clang-c++14:
script: "CI/ci-linux.sh clang C++14"
tags:
- Linux
macos-c++11:
script: "CI/ci-mac.sh C++11"
tags:
- Apple
artifacts:
paths:
- build-release-cpp11/*.dmg
- build-release-cpp11/*.tar.gz
macos-c++98:
script: "CI/ci-mac.sh C++14"
tags:
- Apple
artifacts:
paths:
- build-release-cpp14/*.dmg
- build-release-cpp14/*.tar.gz
.VS2017_64_TEMPLATE: &VS2017_x64 cppcheck:
script: "CI/ci-cppcheck.sh"
tags:
- Linux
artifacts:
paths:
- cppcheck.log
VS2017-64-bit-shared-apps:
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: variables:
BUILD_PLATFORM: "VS2017" BUILD_PLATFORM: "VS2017"
ARCHITECTURE: "x64" ARCHITECTURE: "x64"
SHARED: "FALSE"
APPS: "ON"
script: "CI\\Windows.bat" script: "CI\\Windows.bat"
tags:
- VS2017
- Qt5101
artifacts: artifacts:
paths: paths:
- build-release/*.exe - build-release/*.exe
VS2017-64-bit-shared-no-apps:
variables:
BUILD_PLATFORM: "VS2017"
ARCHITECTURE: "x64"
SHARED: "TRUE"
APPS: "OFF"
script: "CI\\Windows.bat"
tags: tags:
- VS2017 - VS2017
- Qt5101 artifacts:
paths:
- build-release/*.exe
.VS2017_32_TEMPLATE: &VS2017_x32 VS2017-32-bit-shared-no-apps:
variables: variables:
BUILD_PLATFORM: "VS2017" BUILD_PLATFORM: "VS2017"
ARCHITECTURE: "x32" ARCHITECTURE: "x32"
SHARED: "TRUE"
APPS: "OFF"
script: "CI\\Windows.bat" script: "CI\\Windows.bat"
tags: tags:
- VS2017 - VS2017
artifacts: artifacts:
paths: paths:
- build-release/*.exe - build-release/*.exe
### VS2015 ### 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:
BUILD_PLATFORM: "VS2017"
ARCHITECTURE: "x32"
SHARED: "FALSE"
APPS: "OFF"
script: "CI\\Windows.bat"
tags:
- VS2017
artifacts:
paths:
- build-release/*.exe
.VS2015_64_TEMPLATE: &VS2015_x64 VS2015-64-bit-shared-apps:
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: variables:
BUILD_PLATFORM: "VS2015" BUILD_PLATFORM: "VS2015"
ARCHITECTURE: "x64" ARCHITECTURE: "x64"
SHARED: "TRUE"
APPS: "OFF"
script: "CI\\Windows.bat" script: "CI\\Windows.bat"
tags: tags:
- VS2015 - VS2015
...@@ -41,10 +155,12 @@ ...@@ -41,10 +155,12 @@
paths: paths:
- build-release/*.exe - build-release/*.exe
.VS2015_32_TEMPLATE: &VS2015_x32 VS2015-32-bit-shared-apps:
variables: variables:
BUILD_PLATFORM: "VS2015" BUILD_PLATFORM: "VS2015"
ARCHITECTURE: "x32" ARCHITECTURE: "x32"
SHARED: "TRUE"
APPS: "ON"
script: "CI\\Windows.bat" script: "CI\\Windows.bat"
tags: tags:
- VS2015 - VS2015
...@@ -52,183 +168,176 @@ ...@@ -52,183 +168,176 @@
paths: paths:
- build-release/*.exe - build-release/*.exe
### VS2013 ### VS2015-32-bit-shared-no-apps:
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
.VS2013_64_TEMPLATE: &VS2013_x64 VS2015-64-bit-static-no-apps:
variables: variables:
BUILD_PLATFORM: "VS2013" BUILD_PLATFORM: "VS2015"
ARCHITECTURE: "x64" ARCHITECTURE: "x64"
SHARED: "FALSE"
APPS: "OFF"
script: "CI\\Windows.bat" script: "CI\\Windows.bat"
tags: tags:
- VS2013 - VS2015
artifacts: artifacts:
paths: paths:
- build-release/*.exe - build-release/*.exe
.VS2013_32_TEMPLATE: &VS2013_x32 VS2015-32-bit-static-apps:
variables: variables:
BUILD_PLATFORM: "VS2013" BUILD_PLATFORM: "VS2015"
ARCHITECTURE: "x32" ARCHITECTURE: "x32"
SHARED: "FALSE"
APPS: "ON"
script: "CI\\Windows.bat" script: "CI\\Windows.bat"
tags: tags:
- VS2013 - VS2015
artifacts: artifacts:
paths: paths:
- build-release/*.exe - build-release/*.exe
### Linker and App configurations for VS ### VS2015-32-bit-static-no-apps:
.STATIC_NO_APPS: &STATIC_NO_APPS
variables: variables:
BUILD_PLATFORM: "VS2015"
ARCHITECTURE: "x32"
SHARED: "FALSE" SHARED: "FALSE"
APPS: "OFF" APPS: "OFF"
script: "CI\\Windows.bat"
.STATIC_APPS: &STATIC_APPS tags:
- VS2015
artifacts:
paths:
- build-release/*.exe
VS2013-64-bit-shared-apps:
variables: variables:
SHARED: "FLASE" BUILD_PLATFORM: "VS2013"
ARCHITECTURE: "x64"
SHARED: "TRUE"
APPS: "ON" APPS: "ON"
script: "CI\\Windows.bat"
.SHARED_NO_APPS: &SHARED_NO_APPS tags:
- VS2013
artifacts:
paths:
- build-release/*.exe
VS2013-64-bit-shared-no-apps:
variables: variables:
BUILD_PLATFORM: "VS2013"
ARCHITECTURE: "x64"
SHARED: "TRUE" SHARED: "TRUE"
APPS: "OFF" APPS: "OFF"
script: "CI\\Windows.bat"
tags:
- VS2013
artifacts:
paths:
- build-release/*.exe
.SHARED_APPS: &SHARED_APPS VS2013-32-bit-shared-apps:
variables: variables:
BUILD_PLATFORM: "VS2013"
ARCHITECTURE: "x32"
SHARED: "TRUE" SHARED: "TRUE"
APPS: "ON" APPS: "ON"
script: "CI\\Windows.bat"
### 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
gcc-c++14:
script: "CI/ci-linux.sh gcc C++14"
<<: *LINUX_TAG
clang-c++14:
script: "CI/ci-linux.sh clang C++14"
<<: *LINUX_TAG
macos-c++11:
script: "CI/ci-mac.sh C++11"
tags: tags:
- Apple - VS2013
artifacts: artifacts:
paths: paths:
- build-release-cpp11/*.dmg - build-release/*.exe
- build-release-cpp11/*.tar.gz
macos-c++98: VS2013-32-bit-shared-no-apps:
script: "CI/ci-mac.sh C++14" variables:
BUILD_PLATFORM: "VS2013"
ARCHITECTURE: "x32"
SHARED: "TRUE"
APPS: "OFF"
script: "CI\\Windows.bat"
tags: tags:
- Apple - VS2013
artifacts: artifacts:
paths: paths:
- build-release-cpp14/*.dmg - build-release/*.exe
- build-release-cpp14/*.tar.gz
VS2013-64-bit-static-apps:
cppcheck: variables:
script: "CI/ci-cppcheck.sh" BUILD_PLATFORM: "VS2013"
ARCHITECTURE: "x64"
SHARED: "FALSE"
APPS: "ON"
script: "CI\\Windows.bat"
tags: tags:
- Linux - VS2013
artifacts: artifacts:
paths: paths:
- cppcheck.log - build-release/*.exe
VS2017-64-bit-shared-apps:
variables: *SHARED_APPS
<<: *VS2017_x64
VS2017-64-bit-static-apps:
variables: *STATIC_APPS
<<: *VS2017_x64
VS2017-64-bit-shared-no-apps:
variables: *SHARED_NO_APPS
<<: *VS2017_x64
VS2017-64-bit-static-no-apps:
variables: *STATIC_NO_APPS
<<: *VS2017_x64
VS2017-32-bit-shared-no-apps:
variables: *SHARED_NO_APPS
<<: *VS2017_x32
VS2017-32-bit-static-no-apps:
variables: *STATIC_NO_APPS
<<: *VS2017_x32
VS2015-64-bit-shared-apps:
variables: *SHARED_APPS
<<: *VS2015_x64
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
VS2015-32-bit-shared-apps:
variables: *SHARED_APPS
<<: *VS2015_x32
VS2015-32-bit-shared-no-apps:
variables: *SHARED_NO_APPS
<<: *VS2015_x32
VS2015-32-bit-static-apps:
variables: *STATIC_APPS
<<: *VS2015_x32
VS2015-32-bit-static-no-apps:
variables: *STATIC_NO_APPS
<<: *VS2015_x32
VS2013-64-bit-shared-apps:
variables: *SHARED_APPS
<<: *VS2013_x64
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: VS2013-64-bit-static-no-apps:
variables: *STATIC_NO_APPS variables:
<<: *VS2013_x64 BUILD_PLATFORM: "VS2013"
ARCHITECTURE: "x64"
VS2013-32-bit-shared-apps: SHARED: "FALSE"
variables: *SHARED_APPS APPS: "OFF"
<<: *VS2013_x32 script: "CI\\Windows.bat"
tags:
VS2013-32-bit-shared-no-apps: - VS2013
variables: *SHARED_NO_APPS artifacts:
<<: *VS2013_x32 paths:
- build-release/*.exe
VS2013-32-bit-static-apps: VS2013-32-bit-static-apps:
variables: *STATIC_APPS variables:
<<: *VS2013_x32 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: VS2013-32-bit-static-no-apps:
variables: *STATIC_NO_APPS variables:
<<: *VS2013_x32 BUILD_PLATFORM: "VS2013"
ARCHITECTURE: "x32"
SHARED: "FALSE"
APPS: "OFF"
script: "CI\\Windows.bat"
tags:
- VS2013
artifacts:
paths:
- build-release/*.exe
Doc-publish: Doc-publish:
only: only:
......
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