Commit 2699aba9 authored by Jan Kiene's avatar Jan Kiene
Browse files

use script instead of anchor for Werror activation

parent fbc1c2a6

main-basop.yml

+2 −7
Original line number Diff line number Diff line
@@ -81,10 +81,6 @@ workflow: 
    echo "Commit time was $CI_COMMIT_TIMESTAMP"

    ("echo 'System time is'", "Get-Date -Format 'dddd dd/MM/yyyy HH:mm K'") | Invoke-Expression



.activate-Werror-linux: &activate-Werror-linux

  - sed -i.bak "s/^# \(CFLAGS += -Werror\)/\1/" Makefile

  - sed -i.bak "s/# \(set(CMAKE_C_FLAGS \"\${CMAKE_C_FLAGS} -Werror\")\)/\1/" CMakeLists.txt



.activate-WX-windows: &activate-WX-windows

  - (Get-Content -Path "CMakeLists.txt") -replace '# \(add_compile_options\("\/WX"\)\)', '$1' | Set-Content -Path "CMakeLists.txt"

  - Get-ChildItem -Path "Workspace_msvc" -Filter "*.vcxproj" | ForEach-Object { (Get-Content -Path $_.FullName) -replace '<TreatWarningAsError>false', '<TreatWarningAsError>true' | Set-Content -Path $_.FullName }
@@ -949,7 +945,7 @@ build-codec-linux-make: 
  timeout: "100 minutes"

  script:

    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/print-common-info.sh

    - *activate-Werror-linux

    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/activate-Werror-linux.sh

    - make -j



build-codec-linux-cmake:
@@ -968,6 +964,7 @@ build-codec-linux-cmake: 
  script:

    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/print-common-info.sh

    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/update-scripts-repo.sh

    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/activate-Werror-linux.sh

    - cmake -B cmake-build -G "Unix Makefiles"

    - cmake --build cmake-build -- -j
@@ -1010,8 +1007,6 @@ build-codec-sanitizers-linux: 
  script:

    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/print-common-info.sh

    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/update-scripts-repo.sh

    # TODO: re-enable once all the warnings have been fixed

    #- *activate-Werror-linux

    - bash ci/build_codec_sanitizers_linux.sh



build-codec-linux-debugging-make: