Loading .gitlab-ci.yml +14 −12 Original line number Diff line number Diff line Loading @@ -172,11 +172,13 @@ stages: - cp "$LTV_DIR"/*.met scripts/testv/ - cp "$LTV_DIR"/*.csv scripts/testv/ .activate-Werror: &activate-Werror .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 - sed -i.bak "s/# \(add_compile_options(\"\/WX\")\)/\1/" CMakeLists.txt - sed -i.bak "s/<TreatWarningAsError>false/<TreatWarningAsError>true/" Workspace_msvc/*.vcxproj .activate-WX-windows: &activate-WX-windows - (Get-Content -Path "CMakeLists.txt") -replace '# \(add_compile_options\("\/WX"\)\)', '$1' | Set-Content -Path "CMakeLists.txt" - (Get-Content -Path "Workspace_msvc/*.vcxproj") -replace '<TreatWarningAsError>false', '<TreatWarningAsError>true' | Set-Content -Path "Workspace_msvc/*.vcxproj" # --------------------------------------------------------------- # Job templates Loading Loading @@ -303,7 +305,7 @@ build-codec-linux-make: - .rules-basis script: - *print-common-info - *activate-Werror - *activate-Werror-linux - make -j build-codec-linux-cmake: Loading @@ -312,7 +314,7 @@ build-codec-linux-cmake: - .rules-basis script: - *print-common-info - *activate-Werror - *activate-Werror-linux - mkdir build - cd build - cmake .. Loading @@ -326,7 +328,7 @@ build-codec-instrumented-linux: timeout: "6 minutes" script: - *print-common-info - *activate-Werror - *activate-Werror-linux - bash ci/build_codec_instrumented_linux.sh # make sure that the codec builds with msan, asan and usan Loading @@ -336,7 +338,7 @@ build-codec-sanitizers-linux: - .rules-basis script: - *print-common-info - *activate-Werror - *activate-Werror-linux - bash ci/build_codec_sanitizers_linux.sh build-codec-include-split-linux-make: Loading @@ -346,7 +348,7 @@ build-codec-include-split-linux-make: script: - *print-common-info - *enable-split-rendering - *activate-Werror - *activate-Werror-linux - make -j INCLUDE_SPLIT=1 build-codec-include-split-linux-cmake: Loading @@ -356,7 +358,7 @@ build-codec-include-split-linux-cmake: script: - *print-common-info - *enable-split-rendering - *activate-Werror - *activate-Werror-linux - mkdir build - cd build - cmake .. -DINCLUDE_SPLIT=1 Loading @@ -369,7 +371,7 @@ build-codec-windows-cmake: - .rules-basis script: - *print-common-info-windows - *activate-Werror - *activate-WX-windows - cmake -G "Visual Studio 15 2017" . -Bbuild - cmake --build build -j Loading @@ -379,7 +381,7 @@ build-codec-windows-include-split-cmake: - .rules-basis script: - *print-common-info-windows - *activate-Werror - *activate-WX-windows - get-content .\lib_com\options.h | %{$_ -replace "/\*#define[\s]*SPLIT_REND_WITH_HEAD_ROT[\s]*\*/", "#define SPLIT_REND_WITH_HEAD_ROT"} | set-content -Path ./options_patched.h - rm ./lib_com/options.h - mv ./options_patched.h ./lib_com/options.h Loading @@ -392,7 +394,7 @@ build-codec-windows-msbuild: - .rules-basis script: - *print-common-info-windows - *activate-Werror - *activate-WX-windows - py .\scripts\strip_split_rendering.py - MSBuild.exe .\Workspace_msvc\Workspace_msvc.sln /property:Configuration=Debug Loading Loading
.gitlab-ci.yml +14 −12 Original line number Diff line number Diff line Loading @@ -172,11 +172,13 @@ stages: - cp "$LTV_DIR"/*.met scripts/testv/ - cp "$LTV_DIR"/*.csv scripts/testv/ .activate-Werror: &activate-Werror .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 - sed -i.bak "s/# \(add_compile_options(\"\/WX\")\)/\1/" CMakeLists.txt - sed -i.bak "s/<TreatWarningAsError>false/<TreatWarningAsError>true/" Workspace_msvc/*.vcxproj .activate-WX-windows: &activate-WX-windows - (Get-Content -Path "CMakeLists.txt") -replace '# \(add_compile_options\("\/WX"\)\)', '$1' | Set-Content -Path "CMakeLists.txt" - (Get-Content -Path "Workspace_msvc/*.vcxproj") -replace '<TreatWarningAsError>false', '<TreatWarningAsError>true' | Set-Content -Path "Workspace_msvc/*.vcxproj" # --------------------------------------------------------------- # Job templates Loading Loading @@ -303,7 +305,7 @@ build-codec-linux-make: - .rules-basis script: - *print-common-info - *activate-Werror - *activate-Werror-linux - make -j build-codec-linux-cmake: Loading @@ -312,7 +314,7 @@ build-codec-linux-cmake: - .rules-basis script: - *print-common-info - *activate-Werror - *activate-Werror-linux - mkdir build - cd build - cmake .. Loading @@ -326,7 +328,7 @@ build-codec-instrumented-linux: timeout: "6 minutes" script: - *print-common-info - *activate-Werror - *activate-Werror-linux - bash ci/build_codec_instrumented_linux.sh # make sure that the codec builds with msan, asan and usan Loading @@ -336,7 +338,7 @@ build-codec-sanitizers-linux: - .rules-basis script: - *print-common-info - *activate-Werror - *activate-Werror-linux - bash ci/build_codec_sanitizers_linux.sh build-codec-include-split-linux-make: Loading @@ -346,7 +348,7 @@ build-codec-include-split-linux-make: script: - *print-common-info - *enable-split-rendering - *activate-Werror - *activate-Werror-linux - make -j INCLUDE_SPLIT=1 build-codec-include-split-linux-cmake: Loading @@ -356,7 +358,7 @@ build-codec-include-split-linux-cmake: script: - *print-common-info - *enable-split-rendering - *activate-Werror - *activate-Werror-linux - mkdir build - cd build - cmake .. -DINCLUDE_SPLIT=1 Loading @@ -369,7 +371,7 @@ build-codec-windows-cmake: - .rules-basis script: - *print-common-info-windows - *activate-Werror - *activate-WX-windows - cmake -G "Visual Studio 15 2017" . -Bbuild - cmake --build build -j Loading @@ -379,7 +381,7 @@ build-codec-windows-include-split-cmake: - .rules-basis script: - *print-common-info-windows - *activate-Werror - *activate-WX-windows - get-content .\lib_com\options.h | %{$_ -replace "/\*#define[\s]*SPLIT_REND_WITH_HEAD_ROT[\s]*\*/", "#define SPLIT_REND_WITH_HEAD_ROT"} | set-content -Path ./options_patched.h - rm ./lib_com/options.h - mv ./options_patched.h ./lib_com/options.h Loading @@ -392,7 +394,7 @@ build-codec-windows-msbuild: - .rules-basis script: - *print-common-info-windows - *activate-Werror - *activate-WX-windows - py .\scripts\strip_split_rendering.py - MSBuild.exe .\Workspace_msvc\Workspace_msvc.sln /property:Configuration=Debug Loading