From 8ea078affa6aa1a94d6c1da1204e71f44378eec8 Mon Sep 17 00:00:00 2001 From: Yujie Xu Date: Thu, 19 Sep 2024 17:29:30 -0700 Subject: [PATCH 1/2] fix build issue when Link to Python is turned off --- src/EnergyPlus/PythonEngine.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/EnergyPlus/PythonEngine.cc b/src/EnergyPlus/PythonEngine.cc index 96caf26927f..a01f7177820 100644 --- a/src/EnergyPlus/PythonEngine.cc +++ b/src/EnergyPlus/PythonEngine.cc @@ -362,7 +362,7 @@ namespace Python { } #else // NOT LINK_WITH_PYTHON - PythonEngine::PythonEngine() + PythonEngine::PythonEngine(EnergyPlus::EnergyPlusData &state) { ShowFatalError(state, "EnergyPlus is not linked with python"); } From af2e38a5e17cfe1bace922da320c7aa7173cd09c Mon Sep 17 00:00:00 2001 From: Edwin Lee Date: Fri, 20 Sep 2024 08:47:24 -0500 Subject: [PATCH 2/2] Enable alternate build testing, temporarily add it in this branch --- .github/workflows/test_develop_commits.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test_develop_commits.yml b/.github/workflows/test_develop_commits.yml index 849f171c4e5..cdbffe34ff8 100644 --- a/.github/workflows/test_develop_commits.yml +++ b/.github/workflows/test_develop_commits.yml @@ -2,7 +2,7 @@ name: Develop Branch Testing on: push: - branches: [ develop ] # run this on all commits to the develop branch + branches: [ develop, fixPythonEngineBuild ] # run this on all commits to the develop branch defaults: run: @@ -58,13 +58,13 @@ jobs: # nproc: 4 # pretty: "Standard Build on Windows VS 2022" # alternate: false -# - os: ubuntu-24.04 -# arch: x86_64 -# python-arch: x64 -# generator: "Unix Makefiles" -# nproc: 4 -# pretty: "Alternate Build on Ubuntu 24.04" -# alternate: true + - os: ubuntu-24.04 + arch: x86_64 + python-arch: x64 + generator: "Unix Makefiles" + nproc: 4 + pretty: "Alternate Build on Ubuntu 24.04" + alternate: true steps: