From 6ff99c98efc6107548ccf07de60ff66339af1b46 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Mon, 12 Jan 2026 12:46:05 +0100 Subject: [PATCH 1/2] change CI ref + scripts source --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3f84bc99f..e434fe252 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 kiene/test-runner-platform-update # 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 @@ -9,6 +9,7 @@ variables: # these lines are suposed to stay commented out to serve as an example # # set this to true to skip the external HRTF testcases in pytest calls # DISABLE_HRTF: "true" + BASOP_CI_SCRIPTS_BRANCH: "kiene/test-ubuntu-24_04-runner" # all CI code and config is included from https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec-ci include: -- GitLab From 9912e474bebc81590c3f0d1d760b9ebf59e002d3 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Wed, 21 Jan 2026 10:07:41 +0100 Subject: [PATCH 2/2] fix merge artifact --- lib_com/options.h | 1 - 1 file changed, 1 deletion(-) diff --git a/lib_com/options.h b/lib_com/options.h index e1153748e..8afd8f5cb 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -113,7 +113,6 @@ #define FIX_BASOP_2326_WRONG_SIG_LENGTH /* Nokia: basop issue 2326: Fix issue by using correct signal length in multiple places */ #define FIX_BASOP_2327_WRONG_LOOP_END /* Nokia: basop inssue 2327: Correct loop end to solve MSAN error */ #define FIX_BASOP_2328_MSAN_WRONG_ASSIGNMENT /* Nokia: basop issue 2328: Fix MSAN error by correcting the variable assignment */ -#define FIX_BASOP_2329_UNINIT_VALUE /* Nokia: basop issue 2329: Fix issue by checking for structure instead of length */ #define FIX_BASOP_2332_ASAN_OVERFLOW_IN_EXT_DIRAC_REND /* Nokia: basop issue 2332: Uses predefined memory sizes instead computing wrong */ #define FIX_BASOP_2333_MCMASA_ANA_MEMORY_LEAK /* Nokia: basop issue 2333: Add missing free for direction_vector_e to ivas_mcmasa_ana_fx.c */ #define HARM_COREDECODER_FUNCTIONS /* VA: basop issue 2347: Remove various duplicated code in core-decoder */ -- GitLab