Commit 997a6107 authored by Sebastian Wolf's avatar Sebastian Wolf
Browse files

Fix CI script

parent a1945447

.gitlab-ci-configs/.config.mk.ci.gcc

+2 −5
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ COMPATIBILITY = -std=c++11 


STRICT_WARNINGS = TRUE

DEBUG += -D XERUS_TEST_COVERAGE                 # Enable coverage tests

DEBUG += -D _GLIBCXX_ASSERTIONS        # Activate GLIBCXX assertions



DEBUG += -g                # Adds debug symbols
@@ -16,7 +17,3 @@ BLAS_LIBRARIES = -lopenblas -lgfortran # Openblas, serial 
LAPACK_LIBRARIES = -llapacke -llapack                     # Standard Lapack + Lapacke libraries

SUITESPARSE = -lcholmod  -lspqr

BOOST_LIBS = -lboost_filesystem
 


OTHER += -I /usr/include/python2.7/ -lboost_python -I/usr/lib64/python2.7/site-packages/numpy/core/include/ -lpython2.7 -fno-var-tracking-assignments

.gitlab-ci-configs/.config.mk.ci.gcc.nocheck

+1 −6
Original line number Diff line number Diff line
@@ -6,13 +6,11 @@ COMPATIBILITY = -std=c++11 


STRICT_WARNINGS = TRUE



# HIGH_OPTIMIZATION = TRUE          # Activates -O3 -march=native and some others

DEBUG += -D XERUS_DISABLE_RUNTIME_CHECKS    # Disable all runtime checks

DEBUG += -D XERUS_REPLACE_ALLOCATOR



DEBUG += -g                # Adds debug symbols





LOGGING += -D XERUS_LOG_INFO                     # Information that is not linked to any unexpected behaviour bu



#=================================================================================================
@@ -23,7 +21,4 @@ LAPACK_LIBRARIES = -llapacke -llapack # Standard Lapack + La 
SUITESPARSE = -lcholmod -lspqr

BOOST_LIBS = -lboost_filesystem



# custom include paths

# OTHER += -I /path/to/include

.gitlab-ci.yml

+3 −3
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ job_make_gcc: 


job_test_gcc:

  stage: test_gcc

  script: "make version; ./XerusTest all"

  script: "echo $CI_COMMIT_SHA; ./XerusTest all"



job_make_gcc_nocheck:

  stage: build_gcc_nocheck
@@ -40,7 +40,7 @@ job_make_gcc_nocheck: 


job_test_gcc_nocheck:

  stage: test_gcc_nocheck

  script: "make version; ./XerusTest all"

  script: "echo $CI_COMMIT_SHA; ./XerusTest all"



job_build_python2:

  stage: build_python2
@@ -69,5 +69,5 @@ job_make_clang: 


job_test_clang:

  stage: test_clang

  script: "make version; ./XerusTest all"

  script: "echo $CI_COMMIT_SHA; ./XerusTest all"