From 0ceca23d9866c1733330b04e39c274ef13ee310e Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Mon, 9 Oct 2023 10:40:12 +0200
Subject: [PATCH] [ci] Re-enable TH2M on Windows.
---
.github/workflows/msvc-code-analysis.yml | 2 +-
pyproject.toml | 1 -
scripts/ci/jobs/build-gui-win.yml | 2 +-
scripts/ci/jobs/build-win.yml | 2 --
4 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/msvc-code-analysis.yml b/.github/workflows/msvc-code-analysis.yml
index 66b47d479f3..3892838112f 100644
--- a/.github/workflows/msvc-code-analysis.yml
+++ b/.github/workflows/msvc-code-analysis.yml
@@ -15,7 +15,7 @@ jobs:
uses: actions/checkout@v2
- name: Configure CMake
- run: cmake -B ${{ env.build }} -DCMAKE_BUILD_TYPE=${{ env.config }} -DOGS_BUILD_PROCESS_TH2M=OFF -DOGS_USE_UNITY_BUILDS=OFF -DOGS_BUILD_TESTING=OFF -DOGS_ENABLE_ELEMENT_PRISM=OFF -DOGS_ENABLE_ELEMENT_PYRAMID=OFF -DOGS_MAX_ELEMENT_DIM=2
+ run: cmake -B ${{ env.build }} -DCMAKE_BUILD_TYPE=${{ env.config }} -DOGS_USE_UNITY_BUILDS=OFF -DOGS_BUILD_TESTING=OFF -DOGS_ENABLE_ELEMENT_PRISM=OFF -DOGS_ENABLE_ELEMENT_PYRAMID=OFF -DOGS_MAX_ELEMENT_DIM=2
# Build is not required unless generated source files are used
# - name: Build CMake
diff --git a/pyproject.toml b/pyproject.toml
index 8f0af55e70c..113abb2a11c 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -78,7 +78,6 @@ environment-pass = [
# maybe this should be moved to CMake logic, i.e. disabling both features on win
[tool.cibuildwheel.windows.config-settings]
"cmake.define.OGS_USE_MFRONT" = "OFF"
-"cmake.define.OGS_BUILD_PROCESS_TH2M" = "OFF"
# Generator needs to be set here, CMAKE_GENERATOR env var does not work.
# Ninja generator does not select the host64 compiler.
"cmake.args" = "-G;Visual Studio 16 2019;--preset;wheel"
diff --git a/scripts/ci/jobs/build-gui-win.yml b/scripts/ci/jobs/build-gui-win.yml
index 84ea090a82c..5a8e2b4ded0 100644
--- a/scripts/ci/jobs/build-gui-win.yml
+++ b/scripts/ci/jobs/build-gui-win.yml
@@ -5,7 +5,7 @@ build gui win:
rules:
- if: '$CI_COMMIT_BRANCH == "master"'
variables:
- ADDITIONAL_CMAKE_ARGS: " -DOGS_BUILD_CLI=ON -DOGS_BUILD_PROCESS_TH2M=OFF"
+ ADDITIONAL_CMAKE_ARGS: " -DOGS_BUILD_CLI=ON"
BUILD_TESTS: "false"
BUILD_CTEST: "false"
- if: $CI_COMMIT_BRANCH =~ /^v[0-9]\.[0-9]\.[0-9]/
diff --git a/scripts/ci/jobs/build-win.yml b/scripts/ci/jobs/build-win.yml
index c4e687de1c6..772a55de8b0 100644
--- a/scripts/ci/jobs/build-win.yml
+++ b/scripts/ci/jobs/build-win.yml
@@ -5,10 +5,8 @@ build win:
variables:
CHECK_WARNINGS: "true"
CMAKE_PRESET: release
- # TODO: temporary switched off TH2M
CMAKE_ARGS: >-
-DOGS_CI_TESTRUNNER_REPEAT=1
- -DOGS_BUILD_PROCESS_TH2M=OFF
-DOGS_USE_PIP=ON
-DOGS_USE_MKL=ON
--
GitLab