Commit 8255c231 authored by Philipp  Trunschke's avatar Philipp Trunschke
Browse files

fix CI errors (7)

parent fb05bae8
Pipeline #2041 failed with stages
in 12 minutes and 3 seconds
...@@ -9,7 +9,6 @@ DEBUG_OPTIMIZATION = TRUE ...@@ -9,7 +9,6 @@ DEBUG_OPTIMIZATION = TRUE
ACTIVATE_CODE_COVERAGE = TRUE # Enable coverage tests ACTIVATE_CODE_COVERAGE = TRUE # Enable coverage tests
BROCKEN_CI = TRUE # Enable workaround for brocken CI runner BROCKEN_CI = TRUE # Enable workaround for brocken CI runner
DEBUG += -D _GLIBCXX_ASSERTIONS # Activate GLIBCXX assertions DEBUG += -D _GLIBCXX_ASSERTIONS # Activate GLIBCXX assertions
DEBUG += -g # Adds debug symbols DEBUG += -g # Adds debug symbols
#================================================================================================= #=================================================================================================
......
...@@ -4,8 +4,6 @@ ...@@ -4,8 +4,6 @@
CXX = clang++ CXX = clang++
COMPATIBILITY = -std=c++11 COMPATIBILITY = -std=c++11
# STRICT_WARNINGS = TRUE
DEBUG += -D XERUS_DISABLE_RUNTIME_CHECKS # Disable all runtime checks DEBUG += -D XERUS_DISABLE_RUNTIME_CHECKS # Disable all runtime checks
DEBUG += -g # Adds debug symbols DEBUG += -g # Adds debug symbols
......
stages: stages:
- build_homepage - build_homepage
- build_gcc_nocheck - build_gcc_nocheck
- test_gcc_nocheck - test_gcc_nocheck
- code_coverage - build_clang
- build_python - test_clang
# - test_python - code_coverage
- build_clang - build_python
- test_clang - test_python
job_build_homepage: job_build_homepage:
stage: build_homepage stage: build_homepage
...@@ -16,9 +16,10 @@ job_build_homepage: ...@@ -16,9 +16,10 @@ job_build_homepage:
- master - master
allow_failure: true allow_failure: true
job_make_gcc_nocheck: job_build_gcc_nocheck:
stage: build_gcc_nocheck stage: build_gcc_nocheck
script: "g++ --version; cp .gitlab-ci-configs/.config.mk.ci.gcc.nocheck config.mk; make XerusTest_static" script: "g++ --version; cp .gitlab-ci-configs/.config.mk.ci.gcc.nocheck config.mk; make XerusTest_static"
when: always
artifacts: artifacts:
expire_in: 1h30min expire_in: 1h30min
paths: paths:
...@@ -27,16 +28,30 @@ job_make_gcc_nocheck: ...@@ -27,16 +28,30 @@ job_make_gcc_nocheck:
job_test_gcc_nocheck: job_test_gcc_nocheck:
stage: test_gcc_nocheck stage: test_gcc_nocheck
script: "echo $CI_COMMIT_SHA; ./XerusTest_static all" script: "echo $CI_COMMIT_SHA; ./XerusTest_static all"
when: on_success
dependencies: dependencies:
- job_make_gcc_nocheck - job_build_gcc_nocheck
job_build_clang:
stage: build_clang
script: "clang++ --version; cp .gitlab-ci-configs/.config.mk.ci.clang config.mk; make XerusTest_static"
when: always
artifacts:
expire_in: 1h30min
paths:
- XerusTest_static
job_test_clang:
stage: test_clang
script: "echo $CI_COMMIT_SHA; ./XerusTest_static all"
when: on_success
dependencies:
- job_build_clang
job_code_coverage: job_code_coverage:
stage: code_coverage stage: code_coverage
script: "g++ --version; cp .gitlab-ci-configs/.config.mk.ci.cc config.mk; mkdir -p build; make test &> build/build_output.txt || { tail -n 500 build/build_output.txt && readelf -S XerusTest_static && objdump -s -j .cc_loc XerusTest_static && false; }; tail -n 500 build/build_output.txt" script: "clang++ --version; cp .gitlab-ci-configs/.config.mk.ci.cc config.mk; mkdir -p build; make test &> build/build_output.txt || { tail -n 500 build/build_output.txt && readelf -S XerusTest_static && objdump -s -j .cc_loc XerusTest_static && false; }; tail -n 500 build/build_output.txt"
when: always when: on_success
only:
- master
artifacts: artifacts:
expire_in: 3h expire_in: 3h
paths: paths:
...@@ -48,24 +63,14 @@ job_build_python: ...@@ -48,24 +63,14 @@ job_build_python:
when: always when: always
variables: variables:
GIT_SUBMODULE_STRATEGY: normal GIT_SUBMODULE_STRATEGY: normal
# job_test_python:
# stage: test_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_static"
when: always
artifacts: artifacts:
expire_in: 1h30min expire_in: 1h30min
paths: paths:
- XerusTest_static - xerus
job_test_clang: job_test_python:
stage: test_clang stage: test_python
script: "echo $CI_COMMIT_SHA; ./XerusTest_static all" script: 'python3 -c "import xerus; assert xerus.__version__ == \"$(cat VERSION)\""'
when: on_success
dependencies: dependencies:
- job_make_clang - job_build_python
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