Commit dee7136e authored by PLAINSI's avatar PLAINSI
Browse files

Merge branch 'main' into 471-integrate-the-multichannel-parametric-upmix-into-the-jbm-path

parents a5119a46 adda5dd5
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ build-codec-sanitizers-linux:
build-codec-windows-cmake:
  extends:
    - .build-job-windows-with-check-for-warnings
    - .rules-main-push
    - .rules-basis
  script:
    - *print-common-info-windows
    - $winoutdata = $null
@@ -299,7 +299,7 @@ build-codec-windows-cmake:
build-codec-windows-msbuild:
  extends:
    - .build-job-windows-with-check-for-warnings
    - .rules-main-push
    - .rules-basis
  script:
    - *print-common-info-windows
    - $winoutdata = $null
@@ -737,7 +737,7 @@ selection-test-processing:
# ---------------------------------------------------------------

# check bitexactness to EVS windows binaries
.be-2-evs-windows: # Temporarily disabled -- Ericsson Windows runner used for HL activities which the reduces capacity for this job. To be resumed after selection
be-2-evs-windows:
  extends:
    - .rules-main-push
  tags: