Commit a3ea6068 authored by Philipp  Trunschke's avatar Philipp Trunschke

fix CI errors (2)

parent 332a9917
......@@ -6,11 +6,11 @@ COMPATIBILITY = -std=c++14
DEBUG_OPTIMIZATION = TRUE
ACTIVATE_CODE_COVERAGE = TRUE # Enable coverage tests
BROCKEN_CI = TRUE # Enable workaround for brocken CI runner
DEBUG += -D _GLIBCXX_ASSERTIONS # Activate GLIBCXX assertions
ACTIVATE_CODE_COVERAGE = TRUE # Enable coverage tests
BROCKEN_CI = TRUE # Enable workaround for brocken CI runner
DEBUG += -D _GLIBCXX_ASSERTIONS # Activate GLIBCXX assertions
DEBUG += -g # Adds debug symbols
DEBUG += -g # Adds debug symbols
#=================================================================================================
# External libraries
......
......@@ -4,26 +4,17 @@
CXX = clang++-3.9
COMPATIBILITY = -std=c++11
DEBUG += -g # Adds debug symbols
STRICT_WARNINGS = TRUE
DEBUG += -D XERUS_DISABLE_RUNTIME_CHECKS # Disable all runtime checks
LOGGING += -D XERUS_LOG_INFO # Information that is not linked to any unexpected behaviour but might
DEBUG += -g # Adds debug symbols
LOGGING += -D XERUS_LOG_INFO
#=================================================================================================
# External libraries
#=================================================================================================
STRICT_WARNINGS = TRUE
# Uncomment or add the appropriate blas libraries
BLAS_LIBRARIES = -lopenblas -lgfortran # Openblas, serial
# Uncomment or add the appropriate lapack libraries
LAPACK_LIBRARIES = -llapacke -llapack # Standard Lapack + Lapacke libraries
# Uncomment or add the appropriate CXSparse library
BLAS_LIBRARIES = -lopenblas -lgfortran # Openblas, serial
LAPACK_LIBRARIES = -llapacke -llapack # Standard Lapack + Lapacke libraries
SUITESPARSE = -lcholmod -lspqr
BOOST_LIBS = -lboost_filesystem
# custom include paths
# OTHER += -I /path/to/include
......@@ -7,10 +7,9 @@ COMPATIBILITY = -std=c++11
STRICT_WARNINGS = TRUE
DEBUG += -D XERUS_DISABLE_RUNTIME_CHECKS # Disable all runtime checks
# DEBUG += -D XERUS_REPLACE_ALLOCATOR #TODO: generates an error on compilation
DEBUG += -g # Adds debug symbols
LOGGING += -D XERUS_LOG_INFO # Information that is not linked to any unexpected behaviour bu
LOGGING += -D XERUS_LOG_INFO
#=================================================================================================
# External libraries
......@@ -19,5 +18,3 @@ BLAS_LIBRARIES = -lopenblas -lgfortran # Openblas, serial
LAPACK_LIBRARIES = -llapacke -llapack # Standard Lapack + Lapacke libraries
SUITESPARSE = -lcholmod -lspqr
BOOST_LIBS = -lboost_filesystem
......@@ -52,18 +52,18 @@ job_build_python:
# script: "g++ --version; cp .gitlab-ci-configs/.config.mk.ci.gcc.python config.mk; make test_python3"
# when: always
# job_make_clang:
# stage: build_clang
# script: "clang++ --version; cp .gitlab-ci-configs/.config.mk.ci.clang config.mk; make XerusTest"
# when: always
# artifacts:
# expire_in: 1h30min
# paths:
# - XerusTest
job_make_clang:
stage: build_clang
script: "clang++ --version; cp .gitlab-ci-configs/.config.mk.ci.clang config.mk; make XerusTest"
when: always
artifacts:
expire_in: 1h30min
paths:
- XerusTest
# job_test_clang:
# stage: test_clang
# script: "echo $CI_COMMIT_SHA; ./XerusTest all"
# dependencies:
# - job_make_clang
job_test_clang:
stage: test_clang
script: "echo $CI_COMMIT_SHA; ./XerusTest all"
dependencies:
- job_make_clang
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