Commit b0259819 authored by GILLES Sebastien's avatar GILLES Sebastien
Browse files

#1360 Yaml: merge build and test stage (not happy with this, but artifact are...

#1360 Yaml: merge build and test stage (not happy with this, but artifact are too limited in size and cache isn't made to propagate information from a stage to another).
parent 86158afc
......@@ -15,26 +15,22 @@ stages:
untracked: true
paths:
- build
artifacts:
name: "${CI_COMMIT_REF_SLUG}_${OS}-${COMPILER}-${MODE}-${LIB_NATURE}-UniqueLib_${IS_ONLY_ONE_LIB}"
paths:
- build
expire_in: 1 day
script:
- mkdir -p build
- cd build && python ../cmake/Scripts/configure_cmake.py --cache_file=../cmake/PreCache/linux.cmake --cmake_args="-G Ninja" --install_directory=/opt --third_party_directory=/opt --mode=${MODE} --library_type=${LIB_NATURE} --morefem_as_single_library=${IS_ONLY_ONE_LIB}
- ninja -j 4
- ninja
- ninja test # as asrtifact are limited in size, I can;'t unfortunately use a separate stage...
.test_template: &test_template
stage: stage2
image: registry.gitlab.inria.fr/morefem/thirdpartycompilationfactory/${OS}-${COMPILER}-${MODE}:latest
cache:
key: "${CI_COMMIT_REF_SLUG}_${OS}-${COMPILER}-${MODE}-${LIB_NATURE}-UniqueLib_${IS_ONLY_ONE_LIB}"
untracked: true
paths:
- build
script:
- cd build && ctest
# .test_template: &test_template
# stage: stage2
# image: registry.gitlab.inria.fr/morefem/thirdpartycompilationfactory/${OS}-${COMPILER}-${MODE}:latest
# cache:
# key: "${CI_COMMIT_REF_SLUG}_${OS}-${COMPILER}-${MODE}-${LIB_NATURE}-UniqueLib_${IS_ONLY_ONE_LIB}"
# untracked: true
# paths:
# - build
# script:
# - cd build && ctest
build-Ubuntu-gcc-debug-shared-several_libs:
......@@ -47,18 +43,6 @@ build-Ubuntu-gcc-debug-shared-several_libs:
IS_ONLY_ONE_LIB: "False"
test-Ubuntu-gcc-debug-shared-several_libs:
<<: *test_template
dependencies:
- build-Ubuntu-gcc-debug-shared-several_libs
variables:
OS: "ubuntu"
COMPILER: "gcc"
MODE: "debug"
LIB_NATURE: "shared"
IS_ONLY_ONE_LIB: "False"
# build-Ubuntu-gcc-release-static-unique_lib:
# <<: *build_template
# variables:
......@@ -68,18 +52,6 @@ test-Ubuntu-gcc-debug-shared-several_libs:
# LIB_NATURE: "static"
# IS_ONLY_ONE_LIB: "True"
#
#
# test-Ubuntu-gcc-release-static-unique_lib:
# <<: *test_template
# dependencies:
# - build-Ubuntu-gcc-release-static-unique_lib
# variables:
# OS: "ubuntu"
# COMPILER: "gcc"
# MODE: "release"
# LIB_NATURE: "static"
# IS_ONLY_ONE_LIB: "True"
#
build-Fedora-gcc-debug-static-one_lib:
......@@ -91,19 +63,7 @@ build-Fedora-gcc-debug-static-one_lib:
LIB_NATURE: "static"
IS_ONLY_ONE_LIB: "True"
test-Fedora-gcc-debug-static-one_lib:
<<: *test_template
dependencies:
- build-Fedora-gcc-debug-static-one_lib
variables:
OS: "fedora"
COMPILER: "gcc"
MODE: "debug"
LIB_NATURE: "static"
IS_ONLY_ONE_LIB: "True"
# build-Fedora-gcc-release-shared-several_libs:
# <<: *build_template
# variables:
......@@ -113,18 +73,7 @@ test-Fedora-gcc-debug-static-one_lib:
# LIB_NATURE: "shared"
# IS_ONLY_ONE_LIB: "False"
#
#
# test-Fedora-gcc-release-shared-several_libs:
# <<: *test_template
# dependencies:
# - test-Fedora-gcc-release-shared-several_libs
# variables:
# OS: "fedora"
# COMPILER: "gcc"
# MODE: "release"
# LIB_NATURE: "shared"
# IS_ONLY_ONE_LIB: "False"
build-Fedora-clang-debug-static-one_lib:
<<: *build_template
......@@ -135,18 +84,7 @@ build-Fedora-clang-debug-static-one_lib:
LIB_NATURE: "static"
IS_ONLY_ONE_LIB: "True"
test-Fedora-clang-debug-static-one_lib:
<<: *test_template
dependencies:
- build-Fedora-clang-debug-static-one_lib
variables:
OS: "fedora"
COMPILER: "clang"
MODE: "debug"
LIB_NATURE: "static"
IS_ONLY_ONE_LIB: "True"
# build-Fedora-clang-release-shared-several_libs:
# <<: *build_template
......@@ -156,20 +94,7 @@ test-Fedora-clang-debug-static-one_lib:
# MODE: "release"
# LIB_NATURE: "shared"
# IS_ONLY_ONE_LIB: "False"
#
#
# test-Fedora-clang-release-shared-several_libs:
# <<: *test_template
# dependencies:
# - build-Fedora-clang-release-shared-several_libs
# variables:
# OS: "fedora"
# COMPILER: "clang"
# MODE: "release"
# LIB_NATURE: "shared"
# IS_ONLY_ONE_LIB: "False"
# build-macos-clang-debug-shared-several_libs:
# <<: *build_template
......@@ -182,18 +107,6 @@ test-Fedora-clang-debug-static-one_lib:
# LIB_NATURE: "shared"
# IS_ONLY_ONE_LIB: "False"
#
#
# test-macos-clang-debug-shared-several_libs:
# <<: *test_template
# tags:
# - macos, debug, shared, several_libs
# variables:
# OS: "macos"
# COMPILER: "clang"
# MODE: "debug"
# LIB_NATURE: "shared"
# IS_ONLY_ONE_LIB: "False"
# doxygen:
# stage: stage1
......
Supports Markdown
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