diff --git a/includes/build-jobs.yml b/includes/build-jobs.yml new file mode 100644 index 0000000000000000000000000000000000000000..948b69c61cfa54e6f6a80421f60ef8c06be265f1 --- /dev/null +++ b/includes/build-jobs.yml @@ -0,0 +1,19 @@ +# ensure the codec builds with DEBUGGING activated +# warnings are not treated as errors here +build-codec-linux-debugging-make: + extends: + - .build-job-linux + 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 + 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 + - make -j diff --git a/main-basop.yml b/main-basop.yml index a0626dd99885a7df8ee13548c44355749df136e4..6759971be192f45a951faec33159f6c94c0460c8 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 @@ -1036,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 diff --git a/main-float.yml b/main-float.yml index e06cab0c6f5b344f81b22c89b727efc39dbf8ceb..391bfceda595c11d533d0e1ddb811010860ca892 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 b7dc1ac1b54671c26a3b46142f49720821fe7311..3919b25807f7970c9b5c747dec4e3bce3ce447ea 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