Skip to content
Snippets Groups Projects
Commit c091dd11 authored by Jan Möbius's avatar Jan Möbius
Browse files

Merge branch 'featureCIYamlAnchors' into 'master' 

Feature ci yaml anchors

See merge request !170
parents 9a04fd8b 12fb6d7e
No related branches found
No related tags found
1 merge request!170Feature ci yaml anchors
Show whitespace changes
Inline Side-by-side
Showing
with 141 additions and 250 deletions
.gitlab-ci.yml
+ 141
− 250
View file @ c091dd11
gcc-c++11: ### Templates for common job definitions ###
script: "CI/ci-linux.sh gcc C++11" .LINUX_TAG: &LINUX_TAG
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:
- Linux
clang-c++14:
script: "CI/ci-linux.sh clang C++14"
tags: tags:
- Linux - Linux
macos-c++11: ### VS2017 ###
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
cppcheck: .VS2017_64_TEMPLATE: &VS2017_x64
script: "CI/ci-cppcheck.sh"
tags:
- Linux
artifacts:
paths:
- cppcheck.log
VS2017-64-bit-shared-apps:
variables: variables:
BUILD_PLATFORM: "VS2017" BUILD_PLATFORM: "VS2017"
ARCHITECTURE: "x64" ARCHITECTURE: "x64"
SHARED: "TRUE"
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-static-apps:
variables:
BUILD_PLATFORM: "VS2017"
ARCHITECTURE: "x64"
SHARED: "FALSE"
APPS: "ON"
script: "CI\\Windows.bat"
tags: tags:
- VS2017 - VS2017
- Qt5101 - Qt5101
artifacts:
paths:
- build-release/*.exe
VS2017-64-bit-shared-no-apps: .VS2017_32_TEMPLATE: &VS2017_x32
variables:
BUILD_PLATFORM: "VS2017"
ARCHITECTURE: "x64"
SHARED: "TRUE"
APPS: "OFF"
script: "CI\\Windows.bat"
tags:
- VS2017
artifacts:
paths:
- build-release/*.exe
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
...@@ -100,40 +28,23 @@ VS2017-32-bit-shared-no-apps: ...@@ -100,40 +28,23 @@ VS2017-32-bit-shared-no-apps:
paths: paths:
- build-release/*.exe - build-release/*.exe
### VS2015 ###
VS2017-64-bit-static-no-apps: .VS2015_64_TEMPLATE: &VS2015_x64
variables: variables:
BUILD_PLATFORM: "VS2017" BUILD_PLATFORM: "VS2015"
ARCHITECTURE: "x64" 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" script: "CI\\Windows.bat"
tags: tags:
- VS2017 - VS2015
artifacts: artifacts:
paths: paths:
- build-release/*.exe - build-release/*.exe
VS2015-64-bit-shared-apps: .VS2015_32_TEMPLATE: &VS2015_x32
variables: variables:
BUILD_PLATFORM: "VS2015" BUILD_PLATFORM: "VS2015"
ARCHITECTURE: "x64" ARCHITECTURE: "x32"
SHARED: "TRUE"
APPS: "ON"
script: "CI\\Windows.bat" script: "CI\\Windows.bat"
tags: tags:
- VS2015 - VS2015
...@@ -141,203 +52,183 @@ VS2015-64-bit-shared-apps: ...@@ -141,203 +52,183 @@ VS2015-64-bit-shared-apps:
paths: paths:
- build-release/*.exe - build-release/*.exe
### VS2013 ###
VS2015-64-bit-shared-no-apps: .VS2013_64_TEMPLATE: &VS2013_x64
variables: variables:
BUILD_PLATFORM: "VS2015" BUILD_PLATFORM: "VS2013"
ARCHITECTURE: "x64" ARCHITECTURE: "x64"
SHARED: "TRUE"
APPS: "OFF"
script: "CI\\Windows.bat" script: "CI\\Windows.bat"
tags: tags:
- VS2015 - VS2013
artifacts: artifacts:
paths: paths:
- build-release/*.exe - build-release/*.exe
VS2015-32-bit-shared-apps: .VS2013_32_TEMPLATE: &VS2013_x32
variables: variables:
BUILD_PLATFORM: "VS2015" BUILD_PLATFORM: "VS2013"
ARCHITECTURE: "x32" ARCHITECTURE: "x32"
SHARED: "TRUE"
APPS: "ON"
script: "CI\\Windows.bat" script: "CI\\Windows.bat"
tags: tags:
- VS2015 - VS2013
artifacts: artifacts:
paths: paths:
- build-release/*.exe - build-release/*.exe
VS2015-32-bit-shared-no-apps: ### Linker and App configurations for VS ###
.STATIC_NO_APPS: &STATIC_NO_APPS
variables: variables:
BUILD_PLATFORM: "VS2015" SHARED: "FALSE"
ARCHITECTURE: "x32"
SHARED: "TRUE"
APPS: "OFF" APPS: "OFF"
script: "CI\\Windows.bat"
tags:
- VS2015
artifacts:
paths:
- build-release/*.exe
VS2015-64-bit-static-apps: .STATIC_APPS: &STATIC_APPS
variables: variables:
BUILD_PLATFORM: "VS2015" SHARED: "FLASE"
ARCHITECTURE: "x64"
SHARED: "FALSE"
APPS: "ON" APPS: "ON"
script: "CI\\Windows.bat"
tags:
- VS2015
artifacts:
paths:
- build-release/*.exe
VS2015-64-bit-static-no-apps: .SHARED_NO_APPS: &SHARED_NO_APPS
variables: variables:
BUILD_PLATFORM: "VS2015" SHARED: "TRUE"
ARCHITECTURE: "x64"
SHARED: "FALSE"
APPS: "OFF" APPS: "OFF"
script: "CI\\Windows.bat"
tags:
- VS2015
artifacts:
paths:
- build-release/*.exe
VS2015-32-bit-static-apps: .SHARED_APPS: &SHARED_APPS
variables: variables:
BUILD_PLATFORM: "VS2015" SHARED: "TRUE"
ARCHITECTURE: "x32"
SHARED: "FALSE"
APPS: "ON" APPS: "ON"
script: "CI\\Windows.bat"
tags:
- VS2015
artifacts:
paths:
- build-release/*.exe
VS2015-32-bit-static-no-apps: ### actual job definitions ###
variables:
BUILD_PLATFORM: "VS2015"
ARCHITECTURE: "x32"
SHARED: "FALSE"
APPS: "OFF"
script: "CI\\Windows.bat"
tags:
- VS2015
artifacts:
paths:
- build-release/*.exe
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
VS2013-64-bit-shared-apps: gcc-c++14:
variables: script: "CI/ci-linux.sh gcc C++14"
BUILD_PLATFORM: "VS2013" <<: *LINUX_TAG
ARCHITECTURE: "x64"
SHARED: "TRUE"
APPS: "ON"
script: "CI\\Windows.bat"
tags:
- VS2013
artifacts:
paths:
- build-release/*.exe
VS2013-64-bit-shared-no-apps: clang-c++14:
variables: script: "CI/ci-linux.sh clang C++14"
BUILD_PLATFORM: "VS2013" <<: *LINUX_TAG
ARCHITECTURE: "x64"
SHARED: "TRUE" macos-c++11:
APPS: "OFF" script: "CI/ci-mac.sh C++11"
script: "CI\\Windows.bat"
tags: tags:
- VS2013 - Apple
artifacts: artifacts:
paths: paths:
- build-release/*.exe - build-release-cpp11/*.dmg
- build-release-cpp11/*.tar.gz
VS2013-32-bit-shared-apps: macos-c++98:
variables: script: "CI/ci-mac.sh C++14"
BUILD_PLATFORM: "VS2013"
ARCHITECTURE: "x32"
SHARED: "TRUE"
APPS: "ON"
script: "CI\\Windows.bat"
tags: tags:
- VS2013 - Apple
artifacts: artifacts:
paths: paths:
- build-release/*.exe - build-release-cpp14/*.dmg
- build-release-cpp14/*.tar.gz
VS2013-32-bit-shared-no-apps: cppcheck:
variables: script: "CI/ci-cppcheck.sh"
BUILD_PLATFORM: "VS2013"
ARCHITECTURE: "x32"
SHARED: "TRUE"
APPS: "OFF"
script: "CI\\Windows.bat"
tags: tags:
- VS2013 - Linux
artifacts: artifacts:
paths: paths:
- build-release/*.exe - cppcheck.log
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: VS2013-64-bit-static-apps:
variables: variables: *STATIC_APPS
BUILD_PLATFORM: "VS2013" <<: *VS2013_x64
ARCHITECTURE: "x64"
SHARED: "FALSE"
APPS: "ON"
script: "CI\\Windows.bat"
tags:
- VS2013
artifacts:
paths:
- build-release/*.exe
VS2013-64-bit-static-no-apps: VS2013-64-bit-static-no-apps:
variables: variables: *STATIC_NO_APPS
BUILD_PLATFORM: "VS2013" <<: *VS2013_x64
ARCHITECTURE: "x64"
SHARED: "FALSE" VS2013-32-bit-shared-apps:
APPS: "OFF" variables: *SHARED_APPS
script: "CI\\Windows.bat" <<: *VS2013_x32
tags:
- VS2013 VS2013-32-bit-shared-no-apps:
artifacts: variables: *SHARED_NO_APPS
paths: <<: *VS2013_x32
- build-release/*.exe
VS2013-32-bit-static-apps: VS2013-32-bit-static-apps:
variables: variables: *STATIC_APPS
BUILD_PLATFORM: "VS2013" <<: *VS2013_x32
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: variables: *STATIC_NO_APPS
BUILD_PLATFORM: "VS2013" <<: *VS2013_x32
ARCHITECTURE: "x32"
SHARED: "FALSE"
APPS: "OFF"
script: "CI\\Windows.bat"
tags:
- VS2013
artifacts:
paths:
- build-release/*.exe
Doc-publish: Doc-publish:
only: only:
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment