From 2760d85db71586e8d0ea609d7e47e7b6c5bb0d5b Mon Sep 17 00:00:00 2001 From: Erik Norvell Date: Wed, 18 Mar 2026 09:03:57 +0100 Subject: [PATCH 1/3] Remove force of gcc for GCOV --- CMakeLists.txt | 2 +- Makefile | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index aaaafd529..78b748c71 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -64,7 +64,7 @@ if(UNIX) # set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror") # set C compiler - if(GCC OR GCOV) + if(GCC) find_program(cc NAMES gcc-13 gcc REQUIRED) else() find_program(cc NAMES clang-18 clang REQUIRED) diff --git a/Makefile b/Makefile index 15002c5ec..42dcd8dd0 100644 --- a/Makefile +++ b/Makefile @@ -115,7 +115,6 @@ LDFLAGS += -g3 endif ifeq "$(GCOV)" "1" -CC = gcc CFLAGS += -fprofile-arcs -ftest-coverage -fprofile-update=atomic LDFLAGS += -fprofile-arcs -ftest-coverage -fprofile-update=atomic endif -- GitLab From ad8bc6766154e5bd50ad057ac3a55df35fd1d3d4 Mon Sep 17 00:00:00 2001 From: Erik Norvell Date: Wed, 18 Mar 2026 11:28:03 +0100 Subject: [PATCH 2/3] Set ivas-codec-ci branch for testing --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 81e3d0a3d..58eedba5d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ variables: # note: GitLab cannot reference variables defined by users in the include ref:, we need to use a YAML anchor for this # see https://docs.gitlab.com/ci/yaml/includes/#use-variables-with-include for more information - IVAS_CODEC_CI_REF: &IVAS_CODEC_CI_REF main + IVAS_CODEC_CI_REF: &IVAS_CODEC_CI_REF ci/use-llvm-cov # If you need to set some config variable only in a local branch, then add an overwrite here # One example is DISABLE_HRTF - this will be set on a branch which is about to be merged and will be removed in a subsequent second MR # this is more easily done directly here in the child repo -- GitLab From c6be4b9e259d5d60e4c7b96e825f7d896788e91b Mon Sep 17 00:00:00 2001 From: Erik Norvell Date: Wed, 18 Mar 2026 13:10:08 +0100 Subject: [PATCH 3/3] Revert to main for ivas-codec-ci --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 58eedba5d..81e3d0a3d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ variables: # note: GitLab cannot reference variables defined by users in the include ref:, we need to use a YAML anchor for this # see https://docs.gitlab.com/ci/yaml/includes/#use-variables-with-include for more information - IVAS_CODEC_CI_REF: &IVAS_CODEC_CI_REF ci/use-llvm-cov + IVAS_CODEC_CI_REF: &IVAS_CODEC_CI_REF main # If you need to set some config variable only in a local branch, then add an overwrite here # One example is DISABLE_HRTF - this will be set on a branch which is about to be merged and will be removed in a subsequent second MR # this is more easily done directly here in the child repo -- GitLab