From 24fcd4601a84f9020c3d0e90c7fe904f7dcfc25a Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Wed, 22 Jul 2026 20:19:55 -0600 Subject: [PATCH 1/3] fix GLHEVert MSVC unrechable code again, again --- src/EnergyPlus/GroundHeatExchangers/Vertical.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/EnergyPlus/GroundHeatExchangers/Vertical.cc b/src/EnergyPlus/GroundHeatExchangers/Vertical.cc index eb1e1516678..b06aa883032 100644 --- a/src/EnergyPlus/GroundHeatExchangers/Vertical.cc +++ b/src/EnergyPlus/GroundHeatExchangers/Vertical.cc @@ -143,7 +143,7 @@ GLHEVert::GLHEVert(EnergyPlusData &state, std::string const &objName, nlohmann:: if (this->gFuncCalcMethod == GFuncCalcMethod::FullDesign) { #ifndef PYTHON_CLI ShowFatalError(state, "Attempted to use borehole field design in a build without PYTHON_CLI, which is invalid"); -#endif +#else // g-functions won't be calculated until after sizing is complete bool foundSizing = false; bool objTypeFound = j.find("ghe_vertical_sizing_object_type") != j.end(); @@ -305,6 +305,7 @@ GLHEVert::GLHEVert(EnergyPlusData &state, std::string const &objName, nlohmann:: ShowSevereError(state, "Something went wrong creating response factor for GroundHeatExchanger, check previous errors."); errorsFound = true; } +#endif } else if (j.find("ghe_vertical_array_object_name") != j.end()) { // Response factors come from array object From 69acfd47bcb4a40be09ec09eae2f399ff627221a Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Wed, 22 Jul 2026 20:42:23 -0600 Subject: [PATCH 2/3] add another debug build to the workflow to check when python is off --- .github/workflows/test_develop_commits.yml | 24 +++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test_develop_commits.yml b/.github/workflows/test_develop_commits.yml index 40f184fcbec..e2e62b6f82f 100644 --- a/.github/workflows/test_develop_commits.yml +++ b/.github/workflows/test_develop_commits.yml @@ -1,7 +1,7 @@ name: Develop Branch Testing on: - push: + pull_request: branches: [ develop ] # run this on all commits to the develop branch defaults: @@ -41,6 +41,7 @@ jobs: alternate: false build-type: release run-tests: true + link-with-python: true # - os: ubuntu-24.04 # arch: x86_64 # python-arch: x64 @@ -50,15 +51,27 @@ jobs: # alternate: false # build-type: release # run-tests: true +# link-with-python: true - os: windows-2022 arch: x86_64 python-arch: x64 generator: "Visual Studio 17 2022" nproc: 4 - pretty: "Standard Build on Windows VS 2022" + pretty: "Standard Debug Build on Windows VS 2022 - Debug" alternate: false build-type: debug run-tests: false + link-with-python: true + - os: windows-2022 + arch: x86_64 + python-arch: x64 + generator: "Visual Studio 17 2022" + nproc: 4 + pretty: "Standard Build on Windows VS 2022 - Debug, No Python" + alternate: false + build-type: debug + run-tests: false + link-with-python: false - os: ubuntu-24.04 arch: x86_64 python-arch: x64 @@ -68,6 +81,7 @@ jobs: alternate: true build-type: release run-tests: true + link-with-python: false steps: @@ -105,8 +119,8 @@ jobs: -G "${{ matrix.generator }}" -DCMAKE_BUILD_TYPE:STRING="${{ matrix.build-type }}" -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${{ matrix.macos_dev_target }} - -DLINK_WITH_PYTHON:BOOL=ON - -DPYTHON_CLI:BOOL=ON + -DLINK_WITH_PYTHON:BOOL=${{ matrix.link-with-python }} + -DPYTHON_CLI:BOOL=${{ matrix.link-with-python }} -DPython_REQUIRED_VERSION:STRING=${{ steps.setup-python.outputs.python-version }} -DPython_ROOT_DIR:PATH=$RUNNER_TOOL_CACHE/Python/${{ steps.setup-python.outputs.python-version }}/${{ matrix.python-arch }}/ -DBUILD_TESTING:BOOL=ON @@ -122,7 +136,7 @@ jobs: run: > cmake -DCMAKE_BUILD_TYPE="${{ matrix.build-type }}" - -DLINK_WITH_PYTHON=OFF + -DLINK_WITH_PYTHON=${{ matrix.link-with-python }} -DUSE_PSYCHROMETRICS_CACHING=OFF -DUSE_GLYCOL_CACHING=OFF -DOPENGL_REQUIRED=OFF From 5004e12f5a08f49e42d5327a0bdee2ad5babc6f8 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Wed, 22 Jul 2026 22:06:12 -0600 Subject: [PATCH 3/3] flip back to only run on pushes to develop [ci_skip] [decent_ci_skip] --- .github/workflows/test_develop_commits.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test_develop_commits.yml b/.github/workflows/test_develop_commits.yml index e2e62b6f82f..72458166782 100644 --- a/.github/workflows/test_develop_commits.yml +++ b/.github/workflows/test_develop_commits.yml @@ -1,7 +1,7 @@ name: Develop Branch Testing on: - pull_request: + push: branches: [ develop ] # run this on all commits to the develop branch defaults: @@ -57,7 +57,7 @@ jobs: python-arch: x64 generator: "Visual Studio 17 2022" nproc: 4 - pretty: "Standard Debug Build on Windows VS 2022 - Debug" + pretty: "Standard Build on Windows VS 2022 - Debug" alternate: false build-type: debug run-tests: false