Commit edfeec38 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'main' into cleanup-ivas-float-update-remains

parents 4110c59c 8164fe44

includes/build-jobs.yml

0 → 100644
+19 −0
Original line number Diff line number Diff line 
# 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

includes/complexity-jobs.yml

+2 −0
Original line number Diff line number Diff line
@@ -193,6 +193,8 @@ complexity-sba-hoa3-in-ext-out: 
    - if: $MANUAL_PIPELINE_TYPE == 'complexity' || $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 4 hours 30 minutes

  variables:

    JOB_ID_INJECT: ""

  script:

    - in_format=HOA3

    - out_format=EXT

main-basop.yml

+1 −21
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ include: 
  - local: includes/rules-basop.yml

  - local: includes/complexity-jobs.yml

  - local: includes/smoke-test.yml

  - local: includes/build-jobs.yml



stages:

  - .pre
@@ -1023,27 +1024,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

main-float.yml

+1 −1
Original line number Diff line number Diff line 


include:

  - local: main.yml

  - local: includes/default-variables-float.yml

  - local: includes/complexity-jobs.yml

  - local: includes/smoke-test.yml

  - local: includes/build-jobs.yml



stages:

  - .pre

snippets/enable-debugging-macro.sh

+0 −2
Original line number Diff line number Diff line
@@ -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