diff --git a/package/ci/circleci.yml b/package/ci/circleci.yml index 8236dab..361a692 100644 --- a/package/ci/circleci.yml +++ b/package/ci/circleci.yml @@ -230,13 +230,17 @@ commands: file: << parameters.file >> lcov: + parameters: + extra: + type: string + default: "" steps: - run: name: Collect code coverage # Keep in sync with PKBUILD-coverage, please command: | - lcov $LCOV_EXTRA_OPTS --directory . --capture --output-file coverage.info > /dev/null - lcov $LCOV_EXTRA_OPTS --extract coverage.info "*/src/python/*" "*/src/Corrade/*" "*/src/Magnum/*" --output-file coverage.info > /dev/null + lcov << parameters.extra >> --directory . --capture --output-file coverage.info > /dev/null + lcov << parameters.extra >> --extract coverage.info "*/src/python/*" "*/src/Corrade/*" "*/src/Magnum/*" --output-file coverage.info > /dev/null cd src/python && coverage combine - upload-codecov: file: coverage.info @@ -246,7 +250,6 @@ jobs: executor: ubuntu-18_04 environment: CMAKE_CXX_FLAGS: --coverage - LCOV_EXTRA_OPTS: --gcov-tool /usr/bin/gcov-4.8 PLATFORM_GL_API: GLX # It crashes (OOM, probably) with the default setting NINJA_JOBS: -j2 @@ -262,7 +265,8 @@ jobs: - install-meshoptimizer - build: script: unix-desktop.sh - - lcov + - lcov: + extra: --gcov-tool /usr/bin/gcov-4.8 linux-arm64: executor: arm64 @@ -290,7 +294,6 @@ jobs: executor: ubuntu-18_04 environment: CMAKE_CXX_FLAGS: --coverage - LCOV_EXTRA_OPTS: --gcov-tool /usr/bin/gcov-4.8 PLATFORM_GL_API: EGL # STUPID yml interprets unquoted ON as a boolean TARGET_GLES2: "ON" @@ -310,13 +313,13 @@ jobs: build: ubuntu-18.04 - build: script: unix-desktop-gles.sh - - lcov + - lcov: + extra: --gcov-tool /usr/bin/gcov-4.8 linux-gles3: executor: ubuntu-18_04 environment: CMAKE_CXX_FLAGS: --coverage - LCOV_EXTRA_OPTS: --gcov-tool /usr/bin/gcov-4.8 PLATFORM_GL_API: EGL # STUPID yml interprets unquoted OFF as a boolean TARGET_GLES2: "OFF" @@ -336,7 +339,8 @@ jobs: build: ubuntu-18.04 - build: script: unix-desktop-gles.sh - - lcov + - lcov: + extra: --gcov-tool /usr/bin/gcov-4.8 linux-static: executor: ubuntu-18_04 @@ -345,7 +349,6 @@ jobs: # https://stackoverflow.com/questions/53648244/specifying-the-string-value-yes-in-a-yaml-property BUILD_STATIC: "ON" CMAKE_CXX_FLAGS: --coverage - LCOV_EXTRA_OPTS: --gcov-tool /usr/bin/gcov-4.8 PLATFORM_GL_API: GLX # It crashes (OOM, probably) with the default setting NINJA_JOBS: -j2 @@ -361,7 +364,8 @@ jobs: - install-meshoptimizer - build: script: unix-desktop.sh - - lcov + - lcov: + extra: --gcov-tool /usr/bin/gcov-4.8 linux-nondeprecated: executor: ubuntu-18_04 @@ -369,7 +373,6 @@ jobs: # STUPID yml interprets unquoted OFF as a boolean BUILD_DEPRECATED: "OFF" CMAKE_CXX_FLAGS: --coverage - LCOV_EXTRA_OPTS: --gcov-tool /usr/bin/gcov-4.8 PLATFORM_GL_API: GLX # It crashes (OOM, probably) with the default setting NINJA_JOBS: -j2 @@ -385,7 +388,8 @@ jobs: - install-meshoptimizer - build: script: unix-desktop.sh - - lcov + - lcov: + extra: --gcov-tool /usr/bin/gcov-4.8 macos-gl: executor: xcode-14_3