Skip to content

GitLab

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

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

This reverts commit c091dd11, reversing
changes made to 9a04fd8b.
parent 82819182
Pipeline #7043 passed with stage
    in 129 minutes and 26 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 250 additions and 141 deletions
    .gitlab-ci.yml
    View file @ 3b61fd19
    ### Templates for common job definitions ###
    .LINUX_TAG: &LINUX_TAG
    gcc-c++11:
    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:
    - 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:
    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:
    BUILD_PLATFORM: "VS2017"
    ARCHITECTURE: "x64"
    SHARED: "TRUE"
    APPS: "OFF"
    script: "CI\\Windows.bat"
    tags:
    - VS2017
    - Qt5101
    artifacts:
    paths:
    - build-release/*.exe
    .VS2017_32_TEMPLATE: &VS2017_x32
    VS2017-32-bit-shared-no-apps:
    variables:
    BUILD_PLATFORM: "VS2017"
    ARCHITECTURE: "x32"
    SHARED: "TRUE"
    APPS: "OFF"
    script: "CI\\Windows.bat"
    tags:
    - VS2017
    artifacts:
    paths:
    - 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:
    BUILD_PLATFORM: "VS2015"
    ARCHITECTURE: "x64"
    SHARED: "TRUE"
    APPS: "OFF"
    script: "CI\\Windows.bat"
    tags:
    - VS2015
    ......@@ -41,10 +155,12 @@
    paths:
    - build-release/*.exe
    .VS2015_32_TEMPLATE: &VS2015_x32
    VS2015-32-bit-shared-apps:
    variables:
    BUILD_PLATFORM: "VS2015"
    ARCHITECTURE: "x32"
    SHARED: "TRUE"
    APPS: "ON"
    script: "CI\\Windows.bat"
    tags:
    - VS2015
    ......@@ -52,183 +168,176 @@
    paths:
    - 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:
    BUILD_PLATFORM: "VS2013"
    BUILD_PLATFORM: "VS2015"
    ARCHITECTURE: "x64"
    SHARED: "FALSE"
    APPS: "OFF"
    script: "CI\\Windows.bat"
    tags:
    - VS2013
    - VS2015
    artifacts:
    paths:
    - build-release/*.exe
    .VS2013_32_TEMPLATE: &VS2013_x32
    VS2015-32-bit-static-apps:
    variables:
    BUILD_PLATFORM: "VS2013"
    BUILD_PLATFORM: "VS2015"
    ARCHITECTURE: "x32"
    SHARED: "FALSE"
    APPS: "ON"
    script: "CI\\Windows.bat"
    tags:
    - VS2013
    - VS2015
    artifacts:
    paths:
    - build-release/*.exe
    ### Linker and App configurations for VS ###
    .STATIC_NO_APPS: &STATIC_NO_APPS
    VS2015-32-bit-static-no-apps:
    variables:
    BUILD_PLATFORM: "VS2015"
    ARCHITECTURE: "x32"
    SHARED: "FALSE"
    APPS: "OFF"
    .STATIC_APPS: &STATIC_APPS
    script: "CI\\Windows.bat"
    tags:
    - VS2015
    artifacts:
    paths:
    - build-release/*.exe
    VS2013-64-bit-shared-apps:
    variables:
    SHARED: "FLASE"
    BUILD_PLATFORM: "VS2013"
    ARCHITECTURE: "x64"
    SHARED: "TRUE"
    APPS: "ON"
    .SHARED_NO_APPS: &SHARED_NO_APPS
    script: "CI\\Windows.bat"
    tags:
    - VS2013
    artifacts:
    paths:
    - build-release/*.exe
    VS2013-64-bit-shared-no-apps:
    variables:
    BUILD_PLATFORM: "VS2013"
    ARCHITECTURE: "x64"
    SHARED: "TRUE"
    APPS: "OFF"
    script: "CI\\Windows.bat"
    tags:
    - VS2013
    artifacts:
    paths:
    - build-release/*.exe
    .SHARED_APPS: &SHARED_APPS
    VS2013-32-bit-shared-apps:
    variables:
    BUILD_PLATFORM: "VS2013"
    ARCHITECTURE: "x32"
    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
    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"
    script: "CI\\Windows.bat"
    tags:
    - Apple
    - VS2013
    artifacts:
    paths:
    - build-release-cpp11/*.dmg
    - build-release-cpp11/*.tar.gz
    - build-release/*.exe
    macos-c++98:
    script: "CI/ci-mac.sh C++14"
    VS2013-32-bit-shared-no-apps:
    variables:
    BUILD_PLATFORM: "VS2013"
    ARCHITECTURE: "x32"
    SHARED: "TRUE"
    APPS: "OFF"
    script: "CI\\Windows.bat"
    tags:
    - Apple
    - VS2013
    artifacts:
    paths:
    - build-release-cpp14/*.dmg
    - build-release-cpp14/*.tar.gz
    cppcheck:
    script: "CI/ci-cppcheck.sh"
    - build-release/*.exe
    VS2013-64-bit-static-apps:
    variables:
    BUILD_PLATFORM: "VS2013"
    ARCHITECTURE: "x64"
    SHARED: "FALSE"
    APPS: "ON"
    script: "CI\\Windows.bat"
    tags:
    - Linux
    - VS2013
    artifacts:
    paths:
    - 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:
    variables: *STATIC_APPS
    <<: *VS2013_x64
    - build-release/*.exe
    VS2013-64-bit-static-no-apps:
    variables: *STATIC_NO_APPS
    <<: *VS2013_x64
    VS2013-32-bit-shared-apps:
    variables: *SHARED_APPS
    <<: *VS2013_x32
    VS2013-32-bit-shared-no-apps:
    variables: *SHARED_NO_APPS
    <<: *VS2013_x32
    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:
    ......
    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