diff --git a/.github/workflows/test_pull_requests.yml b/.github/workflows/test_pull_requests.yml index aafda588c84..dbfa4ea0856 100644 --- a/.github/workflows/test_pull_requests.yml +++ b/.github/workflows/test_pull_requests.yml @@ -191,8 +191,14 @@ jobs: ${{ steps.upload_regressions.outputs.artifact-url }} - uses: actions/github-script@v7 - if: always() && matrix.run_regressions && steps.regressions.outcome == 'failure' + if: always() && matrix.run_regressions && steps.regressions.outcome == 'failure' && github.event.pull_request.head.repo.full_name == 'NREL/EnergyPlus' with: script: | const script = require('${{ github.workspace }}/regressions/summary.js') console.log(script({github, context})) + + - name: Fail on Regressions from Forked Repository + if: always() && matrix.run_regressions && steps.regressions.outcome == 'failure' && github.event.pull_request.head.repo.full_name != 'NREL/EnergyPlus' + run: | + echo "::error::Regressions detected in pull request from forked repository, check job summary for details and to download regression results" + exit 1 diff --git a/src/EnergyPlus/WindowManager.cc b/src/EnergyPlus/WindowManager.cc index 09db05a68fd..c1be9f99287 100644 --- a/src/EnergyPlus/WindowManager.cc +++ b/src/EnergyPlus/WindowManager.cc @@ -6980,7 +6980,7 @@ namespace Window { auto const *matShade = dynamic_cast(mat); assert(matShade != nullptr); - static constexpr std::string_view Format_703(" WindowMaterial:Shade,,{},{:.3R},{:.3R},{:.3R},{:.3R},{:.3R},{:.3R}\n"); + static constexpr std::string_view Format_703(" WindowMaterial:Shade,{},{:.3R},{:.3R},{:.3R},{:.3R},{:.3R},{:.3R}\n"); print(state.files.eio, Format_703, matShade->Name, diff --git a/src/Transition/OutputRulesFiles/OutputChanges24-2-0-to-25-1-0.md b/src/Transition/OutputRulesFiles/OutputChanges24-2-0-to-25-1-0.md index 88c69eb9946..e3b9cd77c7c 100644 --- a/src/Transition/OutputRulesFiles/OutputChanges24-2-0-to-25-1-0.md +++ b/src/Transition/OutputRulesFiles/OutputChanges24-2-0-to-25-1-0.md @@ -7,6 +7,11 @@ This file documents the structural changes on the output of EnergyPlus that coul This will eventually become a more structured file, but currently it isn't clear what format is best. As an intermediate solution, and to allow the form to be formed organically, this plain text file is being used. Entries should be clearly delimited. It isn't expected that there will be but maybe a couple each release at most. Entries should also include some reference back to the repo. At least a PR number or whatever. +### Output:Constructions for WindowMaterial:Shade +Data for Output:Constructions for WindowMaterial:Shade were misaligned with the column headings in the eio output and the table Initialization Summary report. Data has shifted one column to the left. + +See PR [#10750](https://github.com/NREL/EnergyPlus/pull/10750) + ### Table Output, Sizing Output, and Output:Variable Spelling Corrections * "Equipment Summary" table report, sub-table "VAV DX Cooling Standard Rating Details", column heading, "Assocated Fan" --> "Associated Fan".