From b88f7b292c21bd9bca6182d9212aca795575247a Mon Sep 17 00:00:00 2001 From: Florian OMNES Date: Fri, 7 Jun 2024 15:56:43 +0200 Subject: [PATCH 1/8] Try workaround for runner-related segfaults --- .github/workflows/windows-vcpkg.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/windows-vcpkg.yml b/.github/workflows/windows-vcpkg.yml index ccc8794dcb..5ad09d7d45 100644 --- a/.github/workflows/windows-vcpkg.yml +++ b/.github/workflows/windows-vcpkg.yml @@ -130,7 +130,8 @@ jobs: -DBUILD_TESTING=ON \ -DBUILD_TOOLS=ON \ -DPython3_EXECUTABLE="${{ env.Python3_ROOT_DIR }}/python.exe" \ - -DCMAKE_VS_GLOBALS="CLToolExe=cl.exe;CLToolPath=${GITHUB_WORKSPACE}/ccache;TrackFileAccess=false;UseMultiToolTask=true;DebugInformationFormat=OldStyle" + -DCMAKE_VS_GLOBALS="CLToolExe=cl.exe;CLToolPath=${GITHUB_WORKSPACE}/ccache;TrackFileAccess=false;UseMultiToolTask=true;DebugInformationFormat=OldStyle" \ + -DCMAKE_CXX_FLAGS="/D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR" - name: Build shell: bash From eabfe8d95fc4b3437652aa6c65e920d87990049f Mon Sep 17 00:00:00 2001 From: Florian OMNES Date: Fri, 7 Jun 2024 16:06:45 +0200 Subject: [PATCH 2/8] fix syntax --- .github/workflows/windows-vcpkg.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows-vcpkg.yml b/.github/workflows/windows-vcpkg.yml index 5ad09d7d45..17f4e9bbba 100644 --- a/.github/workflows/windows-vcpkg.yml +++ b/.github/workflows/windows-vcpkg.yml @@ -122,6 +122,7 @@ jobs: shell: bash run: | cmake -B _build -S src \ + -DCMAKE_CXX_FLAGS="/D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR" \ -DCMAKE_PREFIX_PATH="${{ env.ORTOOLS_DIR }}/install" \ -DVCPKG_ROOT="${{env.VCPKG_ROOT}}" \ -DVCPKG_TARGET_TRIPLET=${{ env.triplet }} \ @@ -130,8 +131,8 @@ jobs: -DBUILD_TESTING=ON \ -DBUILD_TOOLS=ON \ -DPython3_EXECUTABLE="${{ env.Python3_ROOT_DIR }}/python.exe" \ - -DCMAKE_VS_GLOBALS="CLToolExe=cl.exe;CLToolPath=${GITHUB_WORKSPACE}/ccache;TrackFileAccess=false;UseMultiToolTask=true;DebugInformationFormat=OldStyle" \ - -DCMAKE_CXX_FLAGS="/D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR" + -DCMAKE_VS_GLOBALS="CLToolExe=cl.exe;CLToolPath=${GITHUB_WORKSPACE}/ccache;TrackFileAccess=false;UseMultiToolTask=true;DebugInformationFormat=OldStyle" + - name: Build shell: bash From 80a8c293f06d492a152033935e8d4b6772367e84 Mon Sep 17 00:00:00 2001 From: Florian OMNES Date: Fri, 7 Jun 2024 16:07:05 +0200 Subject: [PATCH 3/8] p --- .github/workflows/windows-vcpkg.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/windows-vcpkg.yml b/.github/workflows/windows-vcpkg.yml index 17f4e9bbba..a98a343834 100644 --- a/.github/workflows/windows-vcpkg.yml +++ b/.github/workflows/windows-vcpkg.yml @@ -133,7 +133,6 @@ jobs: -DPython3_EXECUTABLE="${{ env.Python3_ROOT_DIR }}/python.exe" \ -DCMAKE_VS_GLOBALS="CLToolExe=cl.exe;CLToolPath=${GITHUB_WORKSPACE}/ccache;TrackFileAccess=false;UseMultiToolTask=true;DebugInformationFormat=OldStyle" - - name: Build shell: bash run: | From 00e8e7c79999f3d8c665d14b44bee08b6c9feba9 Mon Sep 17 00:00:00 2001 From: Florian OMNES Date: Fri, 7 Jun 2024 16:10:29 +0200 Subject: [PATCH 4/8] fix syntax --- .github/workflows/windows-vcpkg.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows-vcpkg.yml b/.github/workflows/windows-vcpkg.yml index a98a343834..c463ee7833 100644 --- a/.github/workflows/windows-vcpkg.yml +++ b/.github/workflows/windows-vcpkg.yml @@ -122,7 +122,7 @@ jobs: shell: bash run: | cmake -B _build -S src \ - -DCMAKE_CXX_FLAGS="/D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR" \ + -DCMAKE_CXX_FLAGS=" /D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR" \ -DCMAKE_PREFIX_PATH="${{ env.ORTOOLS_DIR }}/install" \ -DVCPKG_ROOT="${{env.VCPKG_ROOT}}" \ -DVCPKG_TARGET_TRIPLET=${{ env.triplet }} \ From 84f8df1e20a21c8cc7f7b71f01d4632803df22a9 Mon Sep 17 00:00:00 2001 From: Florian OMNES Date: Fri, 7 Jun 2024 17:42:35 +0200 Subject: [PATCH 5/8] Revert --- .github/workflows/windows-vcpkg.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows-vcpkg.yml b/.github/workflows/windows-vcpkg.yml index c463ee7833..a98a343834 100644 --- a/.github/workflows/windows-vcpkg.yml +++ b/.github/workflows/windows-vcpkg.yml @@ -122,7 +122,7 @@ jobs: shell: bash run: | cmake -B _build -S src \ - -DCMAKE_CXX_FLAGS=" /D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR" \ + -DCMAKE_CXX_FLAGS="/D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR" \ -DCMAKE_PREFIX_PATH="${{ env.ORTOOLS_DIR }}/install" \ -DVCPKG_ROOT="${{env.VCPKG_ROOT}}" \ -DVCPKG_TARGET_TRIPLET=${{ env.triplet }} \ From 596933d0786d3632aa5cba61b31868b73c0dc508 Mon Sep 17 00:00:00 2001 From: Florian OMNES Date: Fri, 7 Jun 2024 17:43:07 +0200 Subject: [PATCH 6/8] Debug --- .github/workflows/windows-vcpkg.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows-vcpkg.yml b/.github/workflows/windows-vcpkg.yml index a98a343834..555973f8af 100644 --- a/.github/workflows/windows-vcpkg.yml +++ b/.github/workflows/windows-vcpkg.yml @@ -127,7 +127,7 @@ jobs: -DVCPKG_ROOT="${{env.VCPKG_ROOT}}" \ -DVCPKG_TARGET_TRIPLET=${{ env.triplet }} \ -DCMAKE_TOOLCHAIN_FILE="${{ env.VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake" \ - -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_BUILD_TYPE=Debug \ # FIXME -DBUILD_TESTING=ON \ -DBUILD_TOOLS=ON \ -DPython3_EXECUTABLE="${{ env.Python3_ROOT_DIR }}/python.exe" \ From 15e695041c398d4b504c6fc0666faf9ae697b310 Mon Sep 17 00:00:00 2001 From: Florian OMNES <26088210+flomnes@users.noreply.github.com> Date: Fri, 7 Jun 2024 18:51:27 +0200 Subject: [PATCH 7/8] Revert more --- .github/workflows/windows-vcpkg.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/windows-vcpkg.yml b/.github/workflows/windows-vcpkg.yml index 555973f8af..610d5da0e4 100644 --- a/.github/workflows/windows-vcpkg.yml +++ b/.github/workflows/windows-vcpkg.yml @@ -122,7 +122,6 @@ jobs: shell: bash run: | cmake -B _build -S src \ - -DCMAKE_CXX_FLAGS="/D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR" \ -DCMAKE_PREFIX_PATH="${{ env.ORTOOLS_DIR }}/install" \ -DVCPKG_ROOT="${{env.VCPKG_ROOT}}" \ -DVCPKG_TARGET_TRIPLET=${{ env.triplet }} \ From 3414f8c1081bca174c2c942f8ea35d86fde28cbf Mon Sep 17 00:00:00 2001 From: Florian OMNES <26088210+flomnes@users.noreply.github.com> Date: Fri, 7 Jun 2024 20:36:27 +0200 Subject: [PATCH 8/8] Disable UI --- .github/workflows/windows-vcpkg.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/windows-vcpkg.yml b/.github/workflows/windows-vcpkg.yml index 610d5da0e4..3083a3c4a8 100644 --- a/.github/workflows/windows-vcpkg.yml +++ b/.github/workflows/windows-vcpkg.yml @@ -127,6 +127,7 @@ jobs: -DVCPKG_TARGET_TRIPLET=${{ env.triplet }} \ -DCMAKE_TOOLCHAIN_FILE="${{ env.VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake" \ -DCMAKE_BUILD_TYPE=Debug \ # FIXME + -DBUILD_UI=OFF \ # FIXME -DBUILD_TESTING=ON \ -DBUILD_TOOLS=ON \ -DPython3_EXECUTABLE="${{ env.Python3_ROOT_DIR }}/python.exe" \