Commit eb7aff64 authored by emerit's avatar emerit
Browse files

Merge branch 'main' into remove_binnew

parents ad42b953 69db45a5

.gitlab-ci.yml

+4 −3
Original line number Diff line number Diff line
@@ -325,11 +325,12 @@ build-codec-instrumented-linux: 
  extends:

    - .build-job-linux

    - .rules-basis

  timeout: "6 minutes"

  timeout: "7 minutes"

  script:

    - *print-common-info

    - *activate-Werror-linux

    - bash ci/build_codec_instrumented_linux.sh

    - ./scripts/prepare_instrumentation.sh

    - make -j -C scripts/c-code_instrument



# make sure that the codec builds with msan, asan and usan

build-codec-sanitizers-linux:
@@ -751,7 +752,7 @@ ivas-pytest-on-merge-request: 
    - .rules-merge-request

  stage: compare

  needs: ["build-codec-linux-cmake", "codec-smoke-test"]

  timeout: "10 minutes"

  timeout: "14 minutes"

  script:

    - *print-common-info

    - *get-commits-behind-count