From 097cd95117c8f173b7935e22d46cea91602309b2 Mon Sep 17 00:00:00 2001 From: knj Date: Mon, 27 Nov 2023 12:02:44 +0100 Subject: [PATCH 1/3] activate SPLIT_REND_HEAD_ROT in split rendering build jobs --- .gitlab-ci.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9755bf3057..60cfca83c8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -352,6 +352,8 @@ build-codec-include-split-linux-make: - .rules-basis script: - *print-common-info + # activate split rendering define + - sed -i.bak -e "s/\/\*\ *\(#define\ *SPLIT_REND_WITH_HEAD_ROT\ *\)\*\//\1/g" ${OUTDIR}/lib_com/options.h - make -j INCLUDE_SPLIT=1 2>&1 | tee $BUILD_OUTPUT # need to use the "|| exit $?" suffix to get the allowed_failure return code, otherwise the job fails with code 1...< - ci/check_for_warnings.py $BUILD_OUTPUT || exit $? @@ -362,6 +364,7 @@ build-codec-include-split-linux-cmake: - .rules-basis script: - *print-common-info + - sed -i.bak -e "s/\/\*\ *\(#define\ *SPLIT_REND_WITH_HEAD_ROT\ *\)\*\//\1/g" ${OUTDIR}/lib_com/options.h - mkdir build - cd build - cmake .. -DINCLUDE_SPLIT=1 @@ -390,6 +393,10 @@ build-codec-windows-include-split-cmake: script: - *print-common-info-windows - $winoutdata = $null + - 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 + - git diff - cmake -DINCLUDE_SPLIT=1 -G "Visual Studio 15 2017" . -Bbuild - cmake --build build -j | tee -variable winoutdata - $winoutdata | Out-File $BUILD_OUTPUT -Encoding Utf8 -- GitLab From 8c040f6d4242e115f98f8dca2a9e3427d9880e3e Mon Sep 17 00:00:00 2001 From: knj Date: Mon, 27 Nov 2023 12:09:28 +0100 Subject: [PATCH 2/3] fix path and add debug output --- .gitlab-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 60cfca83c8..c716ebf329 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -353,7 +353,8 @@ build-codec-include-split-linux-make: script: - *print-common-info # activate split rendering define - - sed -i.bak -e "s/\/\*\ *\(#define\ *SPLIT_REND_WITH_HEAD_ROT\ *\)\*\//\1/g" ${OUTDIR}/lib_com/options.h + - sed -i.bak -e "s/\/\*\ *\(#define\ *SPLIT_REND_WITH_HEAD_ROT\ *\)\*\//\1/g" ./lib_com/options.h + - git diff - make -j INCLUDE_SPLIT=1 2>&1 | tee $BUILD_OUTPUT # need to use the "|| exit $?" suffix to get the allowed_failure return code, otherwise the job fails with code 1...< - ci/check_for_warnings.py $BUILD_OUTPUT || exit $? @@ -364,7 +365,7 @@ build-codec-include-split-linux-cmake: - .rules-basis script: - *print-common-info - - sed -i.bak -e "s/\/\*\ *\(#define\ *SPLIT_REND_WITH_HEAD_ROT\ *\)\*\//\1/g" ${OUTDIR}/lib_com/options.h + - sed -i.bak -e "s/\/\*\ *\(#define\ *SPLIT_REND_WITH_HEAD_ROT\ *\)\*\//\1/g" ./lib_com/options.h - mkdir build - cd build - cmake .. -DINCLUDE_SPLIT=1 -- GitLab From a563d9afe5b6a4e0b84b9b930630078fbc6d018d Mon Sep 17 00:00:00 2001 From: knj Date: Mon, 27 Nov 2023 12:19:01 +0100 Subject: [PATCH 3/3] cleanup --- .gitlab-ci.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c716ebf329..c9aa4b4126 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -352,9 +352,7 @@ build-codec-include-split-linux-make: - .rules-basis script: - *print-common-info - # activate split rendering define - - sed -i.bak -e "s/\/\*\ *\(#define\ *SPLIT_REND_WITH_HEAD_ROT\ *\)\*\//\1/g" ./lib_com/options.h - - git diff + - *enable-split-rendering - make -j INCLUDE_SPLIT=1 2>&1 | tee $BUILD_OUTPUT # need to use the "|| exit $?" suffix to get the allowed_failure return code, otherwise the job fails with code 1...< - ci/check_for_warnings.py $BUILD_OUTPUT || exit $? @@ -365,7 +363,7 @@ build-codec-include-split-linux-cmake: - .rules-basis script: - *print-common-info - - sed -i.bak -e "s/\/\*\ *\(#define\ *SPLIT_REND_WITH_HEAD_ROT\ *\)\*\//\1/g" ./lib_com/options.h + - *enable-split-rendering - mkdir build - cd build - cmake .. -DINCLUDE_SPLIT=1 @@ -397,7 +395,6 @@ build-codec-windows-include-split-cmake: - 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 - - git diff - cmake -DINCLUDE_SPLIT=1 -G "Visual Studio 15 2017" . -Bbuild - cmake --build build -j | tee -variable winoutdata - $winoutdata | Out-File $BUILD_OUTPUT -Encoding Utf8 -- GitLab