Merge remote-tracking branch 'origin/develop' into fixVRFhighCOP

NREL · Sep 20, 2024 · 5556102 · 5556102 · nrel-bot · Sep 20, 2024
2 parents 6c9b079 + 337bfba
commit 5556102
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git 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:
 

diff --git 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");
     }