Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
xerus
xerus
Commits
a3ea6068
Commit
a3ea6068
authored
May 02, 2020
by
Philipp Trunschke
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix CI errors (2)
parent
332a9917
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
25 additions
and
37 deletions
+25
-37
.gitlab-ci-configs/.config.mk.ci.cc
.gitlab-ci-configs/.config.mk.ci.cc
+4
-4
.gitlab-ci-configs/.config.mk.ci.clang
.gitlab-ci-configs/.config.mk.ci.clang
+7
-16
.gitlab-ci-configs/.config.mk.ci.gcc.nocheck
.gitlab-ci-configs/.config.mk.ci.gcc.nocheck
+1
-4
.gitlab-ci.yml
.gitlab-ci.yml
+13
-13
No files found.
.gitlab-ci-configs/.config.mk.ci.cc
View file @
a3ea6068
...
...
@@ -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
...
...
.gitlab-ci-configs/.config.mk.ci.clang
View file @
a3ea6068
...
...
@@ -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
.gitlab-ci-configs/.config.mk.ci.gcc.nocheck
View file @
a3ea6068
...
...
@@ -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
.gitlab-ci.yml
View file @
a3ea6068
...
...
@@ -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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment