Skip to content

Commit

Permalink
Merge pull request #10753 from NREL/fixPythonEngineBuild
Browse files Browse the repository at this point in the history
fix build issue when Link to Python is turned off
  • Loading branch information
Myoldmopar authored Sep 20, 2024
2 parents 80732bf + af2e38a commit 337bfba
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/test_develop_commits.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:

Expand Down
2 changes: 1 addition & 1 deletion src/EnergyPlus/PythonEngine.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
Expand Down

4 comments on commit 337bfba

@nrel-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

develop (Myoldmopar) - Win64-Windows-10-VisualStudio-16: Tests Failed (0 of 0 tests passed, 0 test warnings)

Build Badge Test Badge

@nrel-bot-2c
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

develop (Myoldmopar) - x86_64-Linux-Ubuntu-22.04-gcc-11.4: OK (2913 of 2913 tests passed, 0 test warnings)

Build Badge Test Badge

@nrel-bot-2c
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

develop (Myoldmopar) - x86_64-Linux-Ubuntu-22.04-gcc-11.4-UnitTestsCoverage-RelWithDebInfo: OK (2097 of 2097 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

@nrel-bot-2b
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

develop (Myoldmopar) - x86_64-Linux-Ubuntu-22.04-gcc-11.4-IntegrationCoverage-RelWithDebInfo: OK (799 of 799 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

Please sign in to comment.