Commit e2ef7f6c authored by norvell's avatar norvell
Browse files

Fix merge conflict after renaming of setup-codec anchor

parent a3652a72

.gitlab-ci.yml

+2 −2
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ workflow: 
    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'

      variables:

        IVAS_PIPELINE_NAME: 'MR pipeline: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME'

    ### disabled for now because pipeline setup is redundant with MR pipeline with current workflow

    ### disabled for now because pipeline cd is redundant with MR pipeline with current workflow

    # - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH # Pushes to main

    #   variables:

    #     IVAS_PIPELINE_NAME: 'Push pipeline: $CI_COMMIT_BRANCH'
@@ -970,7 +970,7 @@ ivas-pytest-renderer: 
    - *print-common-info

    - *update-scripts-repo

    - *update-ltv-repo

    - *setup-codec

    - *build-reference-and-dut-binaries

    - *complexity-measurements-setup

    - which coan

  artifacts: