From 7c6b6f261883e282ebe050e18d48c00ce623b8be Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Tue, 29 Apr 2025 08:19:44 +0200 Subject: [PATCH 1/2] add git restore before changing branch --- includes/default-variables.yml | 2 +- snippets/basop/build-binaries.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/includes/default-variables.yml b/includes/default-variables.yml index 229185d..47e355c 100644 --- a/includes/default-variables.yml +++ b/includes/default-variables.yml @@ -7,7 +7,7 @@ variables: TESTS_DIR_CODEC_BE_ON_MR: "tests/codec_be_on_mr_nonselection" IVAS_PIPELINE_NAME: '' GIT_CLEAN_FLAGS: -ffdxq - TESTCASE_TIMEOUT_STV_SANITIZERS: 180 + TESTCASE_TIMEOUT_STV_SANITIZERS: 240 TESTCASE_TIMEOUT_LTV_SANITIZERS: 2400 BASOP_REFERENCE_BRANCH: "ivas-float-update" SCALE_FACTOR: "3.162" diff --git a/snippets/basop/build-binaries.sh b/snippets/basop/build-binaries.sh index c836da3..d0529e7 100755 --- a/snippets/basop/build-binaries.sh +++ b/snippets/basop/build-binaries.sh @@ -36,6 +36,7 @@ fi current_commit_sha="$(git rev-parse HEAD)" +git restore . git checkout "$branch_to_check_out" make clean -- GitLab From 0d4276fe15b19e417f3f084e2583e9ce059e2225 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Tue, 29 Apr 2025 08:30:42 +0200 Subject: [PATCH 2/2] add DEBUG_MODE_INFO activation step right before build --- snippets/basop/build-binaries.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/snippets/basop/build-binaries.sh b/snippets/basop/build-binaries.sh index d0529e7..1d737db 100755 --- a/snippets/basop/build-binaries.sh +++ b/snippets/basop/build-binaries.sh @@ -39,6 +39,8 @@ current_commit_sha="$(git rev-parse HEAD)" git restore . git checkout "$branch_to_check_out" +bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/activate-debug-mode-info-if-set.sh + make clean make -j "$(nproc)" -- GitLab