Skip to content

Commit 2b368fb

Browse files
lgu1234lgu1234
committed
Merge branch 'develop' into RAFN-CheckEquipName-Issue
2 parents 56d97c1 + f58fb10 commit 2b368fb

File tree

86 files changed

+37852
-979
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+37852
-979
lines changed

‎.github/dependabot.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
version: 2
2+
updates:
3+
4+
- package-ecosystem: "github-actions"
5+
directory: "/"
6+
schedule:
7+
# Check for updates to GitHub Actions every week
8+
interval: "weekly"

‎.github/workflows/add_opened_pr_to_project.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
runs-on: ubuntu-latest
2222
steps:
2323
# check out the repo to get the script downloaded
24-
- uses: actions/checkout@v3
24+
- uses: actions/checkout@v4
2525
# gets the current PR and stores it in a variable
2626
- uses: jwalton/gh-find-current-pr@v1
2727
id: findPr

‎.github/workflows/build_wheels.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ jobs:
2727

2828
steps:
2929
- name: Checkout EnergyPlus
30-
uses: actions/checkout@v3
30+
uses: actions/checkout@v4
3131
with:
3232
ref: ${{ github.event.inputs.ref }}
3333

3434
- name: Set up Python ${{ matrix.python-version }}
35-
uses: actions/setup-python@v3
35+
uses: actions/setup-python@v5
3636
with:
3737
python-version: ${{ matrix.python-version }}
3838

@@ -41,7 +41,7 @@ jobs:
4141
pip install wheel
4242
python setup.py bdist_wheel
4343
44-
- uses: actions/upload-artifact@v3
44+
- uses: actions/upload-artifact@v4
4545
with:
4646
name: energyplus-wheel-${{ matrix.os }}
4747
path: ./dist

‎.github/workflows/clang-format-check.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ jobs:
2020
- 'src/EnergyPlus'
2121
- 'tst/EnergyPlus/unit'
2222
steps:
23-
- uses: actions/checkout@v3
23+
- uses: actions/checkout@v4
2424
- name: Run clang-format style check for C/C++ programs.
25-
uses: jidicula/clang-format-action@v4.10.1
25+
uses: jidicula/clang-format-action@v4.13.0
2626
with:
2727
clang-format-version: '10'
2828
check-path: ${{ matrix.path }}

‎.github/workflows/cppcheck.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111

1212
steps:
1313
- name: Checkout EnergyPlus
14-
uses: actions/checkout@v3
14+
uses: actions/checkout@v4
1515

1616
- name: Install cppcheck
1717
shell: bash
@@ -30,7 +30,7 @@ jobs:
3030
3131
- name: Cache cppcheck-build-directory
3232
id: cppcheckcache
33-
uses: actions/cache@v3
33+
uses: actions/cache@v4
3434
with:
3535
path: .cppcheck-build-dir/
3636
key: cppcheckcache
@@ -78,7 +78,7 @@ jobs:
7878

7979
- name: Upload cppcheck results as artifact
8080
if: ${{ always() }}
81-
uses: actions/upload-artifact@v3
81+
uses: actions/upload-artifact@v4
8282
with:
8383
name: EnergyPlus-${{ github.sha }}-cppcheck_results.txt
8484
path: cppcheck.txt

‎.github/workflows/custom_check.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ jobs:
1010
os: [ubuntu-latest]
1111

1212
steps:
13-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v4
1414

1515
- name: Set up Python 3.10
16-
uses: actions/setup-python@v4
16+
uses: actions/setup-python@v5
1717
with:
1818
python-version: '3.10'
1919

‎.github/workflows/documentation-windows.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ jobs:
1515

1616
steps:
1717
- name: Checkout EnergyPlus
18-
uses: actions/checkout@v3
18+
uses: actions/checkout@v4
1919

2020
- name: Set up Python 3.10
21-
uses: actions/setup-python@v4
21+
uses: actions/setup-python@v5
2222
with:
2323
python-version: '3.10'
2424

@@ -103,14 +103,14 @@ jobs:
103103
104104
- name: Upload entire pdf folder
105105
if: ${{ always() }}
106-
uses: actions/upload-artifact@v3
106+
uses: actions/upload-artifact@v4
107107
with:
108108
name: InputOutputReference
109109
path: ${{runner.workspace}}/EnergyPlus/doc/build/pdf/
110110

111111
- name: Upload log folder upon failure
112112
if: ${{ failure() }}
113-
uses: actions/upload-artifact@v3
113+
uses: actions/upload-artifact@v4
114114
with:
115115
name: Xelatex_Logs_after_all
116116
path: C:\Users\runneradmin\AppData\Local\MiKTeX\miktex\log\

‎.github/workflows/documentation.yml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ jobs:
88

99
steps:
1010
- name: Checkout EnergyPlus
11-
uses: actions/checkout@v3
11+
uses: actions/checkout@v4
1212

1313
- name: Set up Python 3.10
14-
uses: actions/setup-python@v4
14+
uses: actions/setup-python@v5
1515
with:
1616
python-version: '3.10'
1717

@@ -33,79 +33,79 @@ jobs:
3333
run: cmake --build . -j 4
3434

3535
- name: Upload Acknowledgments
36-
uses: actions/upload-artifact@v3
36+
uses: actions/upload-artifact@v4
3737
with:
3838
name: Acknowledgments
3939
path: ${{runner.workspace}}/EnergyPlus/doc/build/pdf/Acknowledgments.pdf
4040

4141
- name: Upload AuxiliaryPrograms
42-
uses: actions/upload-artifact@v3
42+
uses: actions/upload-artifact@v4
4343
with:
4444
name: AuxiliaryPrograms
4545
path: ${{runner.workspace}}/EnergyPlus/doc/build/pdf/AuxiliaryPrograms.pdf
4646

4747
- name: Upload EMSApplicationGuide
48-
uses: actions/upload-artifact@v3
48+
uses: actions/upload-artifact@v4
4949
with:
5050
name: EMSApplicationGuide
5151
path: ${{runner.workspace}}/EnergyPlus/doc/build/pdf/EMSApplicationGuide.pdf
5252

5353
- name: Upload EnergyPlusEssentials
54-
uses: actions/upload-artifact@v3
54+
uses: actions/upload-artifact@v4
5555
with:
5656
name: EnergyPlusEssentials
5757
path: ${{runner.workspace}}/EnergyPlus/doc/build/pdf/EnergyPlusEssentials.pdf
5858

5959
- name: Upload EngineeringReference
60-
uses: actions/upload-artifact@v3
60+
uses: actions/upload-artifact@v4
6161
with:
6262
name: EngineeringReference
6363
path: ${{runner.workspace}}/EnergyPlus/doc/build/pdf/EngineeringReference.pdf
6464

6565
- name: Upload ExternalInterfacesApplicationGuide
66-
uses: actions/upload-artifact@v3
66+
uses: actions/upload-artifact@v4
6767
with:
6868
name: ExternalInterfacesApplicationGuide
6969
path: ${{runner.workspace}}/EnergyPlus/doc/build/pdf/ExternalInterfacesApplicationGuide.pdf
7070

7171
- name: Upload GettingStarted
72-
uses: actions/upload-artifact@v3
72+
uses: actions/upload-artifact@v4
7373
with:
7474
name: GettingStarted
7575
path: ${{runner.workspace}}/EnergyPlus/doc/build/pdf/GettingStarted.pdf
7676

7777
- name: Upload InputOutputReference
78-
uses: actions/upload-artifact@v3
78+
uses: actions/upload-artifact@v4
7979
with:
8080
name: InputOutputReference
8181
path: ${{runner.workspace}}/EnergyPlus/doc/build/pdf/InputOutputReference.pdf
8282

8383
- name: Upload InterfaceDeveloper
84-
uses: actions/upload-artifact@v3
84+
uses: actions/upload-artifact@v4
8585
with:
8686
name: InterfaceDeveloper
8787
path: ${{runner.workspace}}/EnergyPlus/doc/build/pdf/InterfaceDeveloper.pdf
8888

8989
- name: Upload ModuleDeveloper
90-
uses: actions/upload-artifact@v3
90+
uses: actions/upload-artifact@v4
9191
with:
9292
name: ModuleDeveloper
9393
path: ${{runner.workspace}}/EnergyPlus/doc/build/pdf/ModuleDeveloper.pdf
9494

9595
- name: Upload OutputDetailsAndExamples
96-
uses: actions/upload-artifact@v3
96+
uses: actions/upload-artifact@v4
9797
with:
9898
name: OutputDetailsAndExamples
9999
path: ${{runner.workspace}}/EnergyPlus/doc/build/pdf/OutputDetailsAndExamples.pdf
100100

101101
- name: Upload PlantApplicationGuide
102-
uses: actions/upload-artifact@v3
102+
uses: actions/upload-artifact@v4
103103
with:
104104
name: PlantApplicationGuide
105105
path: ${{runner.workspace}}/EnergyPlus/doc/build/pdf/PlantApplicationGuide.pdf
106106

107107
- name: Upload UsingEnergyPlusForCompliance
108-
uses: actions/upload-artifact@v3
108+
uses: actions/upload-artifact@v4
109109
with:
110110
name: UsingEnergyPlusForCompliance
111111
path: ${{runner.workspace}}/EnergyPlus/doc/build/pdf/UsingEnergyPlusForCompliance.pdf

‎.github/workflows/epjson.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ jobs:
1717
os: [ubuntu-latest, windows-latest, macos-latest]
1818

1919
steps:
20-
- uses: actions/checkout@v3
20+
- uses: actions/checkout@v4
2121

2222
- name: Set up Python 3.10
23-
uses: actions/setup-python@v4
23+
uses: actions/setup-python@v5
2424
with:
2525
python-version: '3.10'
2626

‎.github/workflows/linux_build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ jobs:
1717
# os: [ubuntu-20.04]
1818
#
1919
# steps:
20-
# - uses: actions/checkout@v3
20+
# - uses: actions/checkout@v4
2121
#
2222
# - name: Set up Python 3.7
23-
# uses: actions/setup-python@v4
23+
# uses: actions/setup-python@v5
2424
# with:
2525
# python-version: 3.7
2626
#
@@ -52,7 +52,7 @@ jobs:
5252
os: [ubuntu-20.04]
5353

5454
steps:
55-
- uses: actions/checkout@v3
55+
- uses: actions/checkout@v4
5656

5757
- name: Install System Dependencies
5858
shell: bash

‎.github/workflows/linux_release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ jobs:
2626
contents: write
2727

2828
steps:
29-
- uses: actions/checkout@v3
29+
- uses: actions/checkout@v4
3030

3131
- name: Set up Python ${{ env.Python_REQUIRED_VERSION }}
3232
id: setup-python
33-
uses: actions/setup-python@v4
33+
uses: actions/setup-python@v5
3434
with:
3535
python-version: ${{ env.Python_REQUIRED_VERSION }}
3636

@@ -129,12 +129,12 @@ jobs:
129129
test_key: ubuntu2204
130130

131131
steps:
132-
- uses: actions/checkout@v3 # Still need E+ checked out to get testing scripts
132+
- uses: actions/checkout@v4 # Still need E+ checked out to get testing scripts
133133
with:
134134
path: checkout
135135

136136
- name: Set up Python ${{ env.Python_REQUIRED_VERSION }}
137-
uses: actions/setup-python@v4
137+
uses: actions/setup-python@v5
138138
id: setup-python
139139
with:
140140
python-version: ${{ env.Python_REQUIRED_VERSION }}

‎.github/workflows/mac_release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ jobs:
4141
contents: write
4242

4343
steps:
44-
- uses: actions/checkout@v3
44+
- uses: actions/checkout@v4
4545

4646
- name: Set up Python ${{ matrix.python }}
4747
id: setup-python
48-
uses: actions/setup-python@v4
48+
uses: actions/setup-python@v5
4949
with:
5050
python-version: ${{ matrix.python }}
5151

@@ -164,12 +164,12 @@ jobs:
164164
# python: 3.12.0 # Make sure to add the package testing below for ARM once we add this build to GHA
165165

166166
steps:
167-
- uses: actions/checkout@v3 # Still need E+ checked out to get testing scripts
167+
- uses: actions/checkout@v4 # Still need E+ checked out to get testing scripts
168168
with:
169169
path: checkout
170170

171171
- name: Set up Python ${{ env.Python_REQUIRED_VERSION }}
172-
uses: actions/setup-python@v4
172+
uses: actions/setup-python@v5
173173
id: setup-python
174174
with:
175175
python-version: ${{ env.Python_REQUIRED_VERSION }}

‎.github/workflows/pr_labels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- name: Verify PR label action
12-
uses: mheap/github-action-required-labels@v3
12+
uses: mheap/github-action-required-labels@v5
1313
with:
1414
mode: minimum
1515
count: 1

‎.github/workflows/windows_release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ jobs:
4949
contents: write
5050

5151
steps:
52-
- uses: actions/checkout@v3
52+
- uses: actions/checkout@v4
5353

5454
- name: Set up Python ${{ env.Python_REQUIRED_VERSION }}
55-
uses: actions/setup-python@v4
55+
uses: actions/setup-python@v5
5656
id: setup-python
5757
with:
5858
python-version: ${{ env.Python_REQUIRED_VERSION }}
@@ -177,12 +177,12 @@ jobs:
177177
runs-on: windows-2019
178178

179179
steps:
180-
- uses: actions/checkout@v3 # Still need E+ checked out to get testing scripts
180+
- uses: actions/checkout@v4 # Still need E+ checked out to get testing scripts
181181
with:
182182
path: checkout
183183

184184
- name: Set up Python ${{ env.Python_REQUIRED_VERSION }}
185-
uses: actions/setup-python@v4
185+
uses: actions/setup-python@v5
186186
id: setup-python
187187
with:
188188
python-version: ${{ env.Python_REQUIRED_VERSION }}

‎CMakeLists.txt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
cmake_minimum_required(VERSION 3.17)
22

33
# Use ccache if available, has to be before "project()"
4-
find_program(CCACHE_PROGRAM ccache)
4+
find_program(CCACHE_PROGRAM NAMES ccache sccache)
55
if(CCACHE_PROGRAM)
6-
# Support both Unix Makefiles and Ninja
7-
set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
6+
# Support: Unix Makefiles and Ninja only
7+
message(STATUS "Using CCACHE")
8+
# RULE_LAUNCH_COMPILE is an internal variable and makes RC compilation fail on windows, hence why we use the C/CXX COMPILER_LAUNCHER instead
9+
message(STATUS "${CCACHE_PROGRAM} found and enabled")
10+
set(CMAKE_CXX_COMPILER_LAUNCHER ${CCACHE_PROGRAM} CACHE FILEPATH "CXX compiler cache used")
11+
set(CMAKE_C_COMPILER_LAUNCHER ${CCACHE_PROGRAM} CACHE FILEPATH "C compiler cache used")
812
endif()
913

1014
cmake_policy(SET CMP0048 NEW) # handling project_version_* variables

0 commit comments

Comments
 (0)