diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f2269239913b1e9e77532883da8cf4e563d68f99..8f77eea4848b735b3489d93238e3335e36cf04c5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,7 +24,6 @@ variables: CPPLIB_REGISTRY_IMAGE: $CI_REGISTRY/caosdb/src/caosdb-cpplib/testenv:$CI_COMMIT_REF_NAME CPPINTTEST_PIPELINE: https://gitlab.indiscale.com/api/v4/projects/111/trigger/pipeline - CPPINTTEST_BRANCHES: https://gitlab.indiscale.com/api/v4/projects/111/repository/branches GIT_SUBMODULE_STRATEGY: normal ## FOR DEBUGGING @@ -50,7 +49,6 @@ info: - echo "Pipeline triggered by $TRIGGERED_BY_REPO@$TRIGGERED_BY_REF ($TRIGGERED_BY_HASH)" - echo "$CPPLIB_REGISTRY_IMAGE" - echo "$CPPINTTEST_PIPELINE" - - echo "$CPPINTTEST_BRANCHES" - echo "$GIT_SUBMODULE_STRATEGY" # Build a docker image in which tests for this repository can run @@ -85,6 +83,9 @@ test: - mkdir build - cd build - conan install .. -s "compiler.libcxx=libstdc++11" + - FILE_TO_BE_PATCHED="$(grep "std::unique_ptr<ContextAllocator> context_allocator) {}" -l -r $(conan config home))" + - echo "FILE_TO_BE_PATCHED=$FILE_TO_BE_PATCHED" + - sed -e "s|std::unique_ptr<ContextAllocator> context_allocator) {}|std::unique_ptr<ContextAllocator> /*context_allocator*/) {}|" -i $FILE_TO_BE_PATCHED - cmake -DCMAKE_BUILD_TYPE=Debug .. - cmake --build . - cmake --build . --target unit_test_coverage