From 09c7cd1860d674b8bfb7f3a1e716f8efbde4fb9f Mon Sep 17 00:00:00 2001 From: Scott Horowitz Date: Tue, 15 Oct 2024 12:33:52 -0600 Subject: [PATCH 1/2] Fix CI --- .github/workflows/config.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml index 7bf69a797e..3756f4d4df 100644 --- a/.github/workflows/config.yml +++ b/.github/workflows/config.yml @@ -160,7 +160,7 @@ jobs: mkdir workflow/tests/test_results cp -r test_results/results* workflow/tests/test_results cd workflow/tests - pip install pandas + pip install pandas --break-system-packages 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 - name: Store results @@ -206,10 +206,10 @@ jobs: mkdir workflow/tests/test_results cp -r test_results/results* workflow/tests/test_results - pip install numpy - pip install pandas - pip install plotly - pip install kaleido + pip install numpy --break-system-packages + pip install pandas --break-system-packages + pip install plotly --break-system-packages + pip install kaleido --break-system-packages python workflow/tests/compare.py -a results python workflow/tests/compare.py -a visualize From 301ae67c05ce304386ad17979c11038167f93872 Mon Sep 17 00:00:00 2001 From: Scott Horowitz Date: Wed, 16 Oct 2024 12:09:55 -0600 Subject: [PATCH 2/2] Pin ubuntu-22.04 while GitHub works on fixing ubuntu-latest. --- .github/workflows/config.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml index 3756f4d4df..050afd43bb 100644 --- a/.github/workflows/config.yml +++ b/.github/workflows/config.yml @@ -9,7 +9,7 @@ on: jobs: run-unit-tests: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 container: image: docker://nrel/openstudio:3.8.0 steps: @@ -75,7 +75,7 @@ jobs: path: docs/_build/html/ run-workflow1-tests: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 container: image: docker://nrel/openstudio:3.8.0 steps: @@ -98,7 +98,7 @@ jobs: name: results-workflow1-tests run-workflow2-tests: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 container: image: docker://nrel/openstudio:3.8.0 steps: @@ -136,7 +136,7 @@ jobs: & .\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 merge-results: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 needs: [run-workflow1-tests, run-workflow2-tests, run-unit-tests] steps: - uses: actions/checkout@v4 @@ -160,7 +160,7 @@ jobs: mkdir workflow/tests/test_results cp -r test_results/results* workflow/tests/test_results cd workflow/tests - pip install pandas --break-system-packages + pip install pandas 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 - name: Store results @@ -171,7 +171,7 @@ jobs: compare-results: if: github.event_name == 'pull_request' - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 needs: merge-results steps: - uses: actions/checkout@v4 @@ -206,10 +206,10 @@ jobs: mkdir workflow/tests/test_results cp -r test_results/results* workflow/tests/test_results - pip install numpy --break-system-packages - pip install pandas --break-system-packages - pip install plotly --break-system-packages - pip install kaleido --break-system-packages + pip install numpy + pip install pandas + pip install plotly + pip install kaleido python workflow/tests/compare.py -a results python workflow/tests/compare.py -a visualize @@ -221,7 +221,7 @@ jobs: name: comparisons update-results: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 needs: merge-results steps: - uses: actions/checkout@v4