Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit c091dd11d8, reversing
changes made to 9a04fd8b2b.
This commit is contained in:
Jan Möbius
2018-05-24 08:53:49 +02:00
parent 82819182b2
commit 3b61fd197a
1 changed files with 272 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

435
.gitlab-ci.yml
View File

@@ -1,120 +1,22 @@
### Templates for common job definitions ### gcc-c++11:
.LINUX_TAG: &LINUX_TAG script: "CI/ci-linux.sh gcc C++11"
tags: tags:
- Linux - 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: clang-c++11:
script: "CI/ci-linux.sh clang C++11" script: "CI/ci-linux.sh clang C++11"
<<: *LINUX_TAG tags:
- Linux
gcc-c++14: gcc-c++14:
script: "CI/ci-linux.sh gcc C++14" script: "CI/ci-linux.sh gcc C++14"
<<: *LINUX_TAG tags:
- Linux
clang-c++14: clang-c++14:
script: "CI/ci-linux.sh clang C++14" script: "CI/ci-linux.sh clang C++14"
<<: *LINUX_TAG tags:
- Linux
macos-c++11: macos-c++11:
script: "CI/ci-mac.sh C++11" script: "CI/ci-mac.sh C++11"
@@ -141,94 +43,301 @@ cppcheck:
artifacts: artifacts:
paths: paths:
- cppcheck.log - cppcheck.log
VS2017-64-bit-shared-apps: VS2017-64-bit-shared-apps:
variables: *SHARED_APPS variables:
<<: *VS2017_x64 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: VS2017-64-bit-static-apps:
variables: *STATIC_APPS variables:
<<: *VS2017_x64 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: VS2017-64-bit-shared-no-apps:
variables: *SHARED_NO_APPS variables:
<<: *VS2017_x64 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: VS2017-32-bit-shared-no-apps:
variables: *SHARED_NO_APPS variables:
<<: *VS2017_x32 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: VS2017-32-bit-static-no-apps:
variables: *STATIC_NO_APPS variables:
<<: *VS2017_x32 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: VS2015-64-bit-shared-apps:
variables: *SHARED_APPS variables:
<<: *VS2015_x64 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: VS2015-64-bit-shared-no-apps:
variables: *SHARED_NO_APPS variables:
<<: *VS2015_x64 BUILD_PLATFORM: "VS2015"
ARCHITECTURE: "x64"
VS2015-64-bit-static-apps: SHARED: "TRUE"
variables: *STATIC_APPS APPS: "OFF"
<<: *VS2015_x64 script: "CI\\Windows.bat"
tags:
VS2015-64-bit-static-no-apps: - VS2015
variables: *STATIC_NO_APPS artifacts:
<<: *VS2015_x64 paths:
- build-release/*.exe
VS2015-32-bit-shared-apps: VS2015-32-bit-shared-apps:
variables: *SHARED_APPS variables:
<<: *VS2015_x32 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: VS2015-32-bit-shared-no-apps:
variables: *SHARED_NO_APPS variables:
<<: *VS2015_x32 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: VS2015-32-bit-static-apps:
variables: *STATIC_APPS variables:
<<: *VS2015_x32 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: VS2015-32-bit-static-no-apps:
variables: *STATIC_NO_APPS variables:
<<: *VS2015_x32 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: VS2013-64-bit-shared-apps:
variables: *SHARED_APPS variables:
<<: *VS2013_x64 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: VS2013-64-bit-shared-no-apps:
variables: *SHARED_NO_APPS variables:
<<: *VS2013_x64 BUILD_PLATFORM: "VS2013"
ARCHITECTURE: "x64"
VS2013-64-bit-static-apps: SHARED: "TRUE"
variables: *STATIC_APPS APPS: "OFF"
<<: *VS2013_x64 script: "CI\\Windows.bat"
tags:
VS2013-64-bit-static-no-apps: - VS2013
variables: *STATIC_NO_APPS artifacts:
<<: *VS2013_x64 paths:
- build-release/*.exe
VS2013-32-bit-shared-apps: VS2013-32-bit-shared-apps:
variables: *SHARED_APPS variables:
<<: *VS2013_x32 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: VS2013-32-bit-shared-no-apps:
variables: *SHARED_NO_APPS variables:
<<: *VS2013_x32 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: 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: