From bbe4747509e11c741f5c3f88d004630955856c4a Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Thu, 27 Nov 2025 17:09:38 +0100 Subject: [PATCH 1/3] add job to test build with DEBUGGING active --- includes/build-jobs.yml | 10 ++++++++++ main-basop.yml | 1 + main-float.yml | 2 +- snippets/enable-debugging-macro.sh | 2 -- 4 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 includes/build-jobs.yml diff --git a/includes/build-jobs.yml b/includes/build-jobs.yml new file mode 100644 index 0000000..76a82f3 --- /dev/null +++ b/includes/build-jobs.yml @@ -0,0 +1,10 @@ +# ensure the codec builds with DEBUGGING activated +# warnings are not treated as errors here +build-codec-linux-debugging: + extends: + - .build-job-linux + - .rules-merge-request-to-main + script: + - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/print-common-info.sh + - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/enable-debugging-macro.sh + - make -j diff --git a/main-basop.yml b/main-basop.yml index a0626dd..65d1896 100644 --- a/main-basop.yml +++ b/main-basop.yml @@ -3,6 +3,7 @@ include: - local: includes/default-variables-basop.yml - local: includes/rules-basop.yml - local: includes/complexity-jobs.yml + - local: includes/build-jobs.yml stages: - .pre diff --git a/main-float.yml b/main-float.yml index e06cab0..391bfce 100644 --- a/main-float.yml +++ b/main-float.yml @@ -1,8 +1,8 @@ - include: - local: main.yml - local: includes/default-variables-float.yml - local: includes/complexity-jobs.yml + - local: includes/build-jobs.yml stages: - .pre diff --git a/snippets/enable-debugging-macro.sh b/snippets/enable-debugging-macro.sh index b7dc1ac..3919b25 100755 --- a/snippets/enable-debugging-macro.sh +++ b/snippets/enable-debugging-macro.sh @@ -2,8 +2,6 @@ set -euxo pipefail -cd "${CI_PROJECT_DIR}" - # automatically enable #DEBUGGING macro in options.h using either /**/-comment or //-comment sed -i.bak -e "s/\/\*\ *\(#define\ *DEBUGGING\ *\)\*\//\1/g" lib_com/options.h sed -i.bak -e "s/\/\/\ *\(#define\ *DEBUGGING\ *\)/\1/g" lib_com/options.h -- GitLab From 774fbe2a9558754969e6eacce90d1da5ad962bba Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Thu, 27 Nov 2025 17:22:27 +0100 Subject: [PATCH 2/3] move job and rules from basop --- includes/build-jobs.yml | 12 ++++++++++-- main-basop.yml | 21 --------------------- 2 files changed, 10 insertions(+), 23 deletions(-) diff --git a/includes/build-jobs.yml b/includes/build-jobs.yml index 76a82f3..3950a3b 100644 --- a/includes/build-jobs.yml +++ b/includes/build-jobs.yml @@ -1,9 +1,17 @@ # ensure the codec builds with DEBUGGING activated # warnings are not treated as errors here -build-codec-linux-debugging: +build-codec-linux-debugging-make: extends: - .build-job-linux - - .rules-merge-request-to-main + rules: + - if: $CI_MERGE_REQUEST_TITLE =~ /^(\[Draft\]|\(Draft\)|Draft:)/ + when: never + - if: $MANUAL_PIPELINE_TYPE == 'long-term-logs' || $MANUAL_PIPELINE_TYPE == 'backup-long-term-logs' || $UPDATE_PAGES + when: never + - if: $MANUAL_PIPELINE_TYPE == 'pytest-compare-enc-dmx' + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + - if: $CI_PIPELINE_SOURCE == 'push' + when: never script: - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/print-common-info.sh - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/enable-debugging-macro.sh diff --git a/main-basop.yml b/main-basop.yml index 65d1896..6759971 100644 --- a/main-basop.yml +++ b/main-basop.yml @@ -1037,27 +1037,6 @@ build-codec-sanitizers-linux: - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/activate-Werror-linux.sh - bash ci/build_codec_sanitizers_linux.sh -build-codec-linux-debugging-make: - rules: - - if: $CI_MERGE_REQUEST_TITLE =~ /^(\[Draft\]|\(Draft\)|Draft:)/ - when: never - - if: $MANUAL_PIPELINE_TYPE == 'long-term-logs' || $MANUAL_PIPELINE_TYPE == 'backup-long-term-logs' || $UPDATE_PAGES - when: never - - if: $MANUAL_PIPELINE_TYPE == 'pytest-compare-enc-dmx' - - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - - if: $CI_PIPELINE_SOURCE == 'merge_request_event' - - if: $CI_PIPELINE_SOURCE == 'push' - when: never - extends: - - .build-job-linux - timeout: "10 minutes" - variables: - BUILD_WITH_DEBUG_MODE_INFO: "true" - script: - - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/print-common-info.sh - - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/activate-debug-mode-info-if-set.sh - - make -j - build-codec-windows-msbuild: rules: - if: $MANUAL_PIPELINE_TYPE == 'long-term-logs' || $MANUAL_PIPELINE_TYPE == 'backup-long-term-logs' || $MANUAL_PIPELINE_TYPE == 'ivas-conformance-linux' || $UPDATE_PAGES || $MANUAL_PIPELINE_TYPE == 'complexity' || $MEASURE_COMPLEXITY_LINUX -- GitLab From 3bee13c3c82ede9358e4b6e22163400e91e85088 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Thu, 27 Nov 2025 17:28:03 +0100 Subject: [PATCH 3/3] add timeout --- includes/build-jobs.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/includes/build-jobs.yml b/includes/build-jobs.yml index 3950a3b..948b69c 100644 --- a/includes/build-jobs.yml +++ b/includes/build-jobs.yml @@ -12,6 +12,7 @@ build-codec-linux-debugging-make: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' - if: $CI_PIPELINE_SOURCE == 'push' when: never + timeout: "10 minutes" script: - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/print-common-info.sh - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/enable-debugging-macro.sh -- GitLab