Skip to content

Commit 67301d7

Browse files
committed
Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hpwh_capacities
2 parents bd4bde1 + 301ae67 commit 67301d7

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

.github/workflows/config.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99

1010
jobs:
1111
run-unit-tests:
12-
runs-on: ubuntu-latest
12+
runs-on: ubuntu-22.04
1313
container:
1414
image: docker://nrel/openstudio:3.8.0
1515
steps:
@@ -75,7 +75,7 @@ jobs:
7575
path: docs/_build/html/
7676

7777
run-workflow1-tests:
78-
runs-on: ubuntu-latest
78+
runs-on: ubuntu-22.04
7979
container:
8080
image: docker://nrel/openstudio:3.8.0
8181
steps:
@@ -98,7 +98,7 @@ jobs:
9898
name: results-workflow1-tests
9999

100100
run-workflow2-tests:
101-
runs-on: ubuntu-latest
101+
runs-on: ubuntu-22.04
102102
container:
103103
image: docker://nrel/openstudio:3.8.0
104104
steps:
@@ -136,7 +136,7 @@ jobs:
136136
& .\OpenStudio-${env:OS_VERSION}+${env:OS_SHA}-Windows\bin\openstudio.exe workflow\run_simulation.rb -x workflow\sample_files\base.xml --hourly ALL --add-component-loads --add-stochastic-schedules
137137
138138
merge-results:
139-
runs-on: ubuntu-latest
139+
runs-on: ubuntu-22.04
140140
needs: [run-workflow1-tests, run-workflow2-tests, run-unit-tests]
141141
steps:
142142
- uses: actions/checkout@v4
@@ -160,7 +160,7 @@ jobs:
160160
mkdir workflow/tests/test_results
161161
cp -r test_results/results* workflow/tests/test_results
162162
cd workflow/tests
163-
pip install pandas --break-system-packages
163+
pip install pandas
164164
for csv in test_results/*1_*.csv; do csv2="${csv/1_/2_}"; csv_out="${csv/1_/_}"; python merge.py $csv $csv2 $csv_out; rm $csv; rm $csv2; done
165165
166166
- name: Store results
@@ -171,7 +171,7 @@ jobs:
171171

172172
compare-results:
173173
if: github.event_name == 'pull_request'
174-
runs-on: ubuntu-latest
174+
runs-on: ubuntu-22.04
175175
needs: merge-results
176176
steps:
177177
- uses: actions/checkout@v4
@@ -206,10 +206,10 @@ jobs:
206206
mkdir workflow/tests/test_results
207207
cp -r test_results/results* workflow/tests/test_results
208208
209-
pip install numpy --break-system-packages
210-
pip install pandas --break-system-packages
211-
pip install plotly --break-system-packages
212-
pip install kaleido --break-system-packages
209+
pip install numpy
210+
pip install pandas
211+
pip install plotly
212+
pip install kaleido
213213
214214
python workflow/tests/compare.py -a results
215215
python workflow/tests/compare.py -a visualize
@@ -221,7 +221,7 @@ jobs:
221221
name: comparisons
222222

223223
update-results:
224-
runs-on: ubuntu-latest
224+
runs-on: ubuntu-22.04
225225
needs: merge-results
226226
steps:
227227
- uses: actions/checkout@v4

0 commit comments

Comments
 (0)