Skip to content

Fix ApplyUpgrade measure and most CI failures #1556

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shorowit merged 9 commits into from
May 8, 2026
Merged

Fix ApplyUpgrade measure and most CI failures #1556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b60b084
Fix measure.
shorowit May 7, 2026
bbeb024
Fix link
shorowit May 7, 2026
eab55d8
SDR options analysis results.
May 7, 2026
c1d367f
Replace 'polars-lts-cpu' with 'polars'
rajeee May 7, 2026
2f7e072
Bump GHA versions
shorowit May 7, 2026
ad6a9ab
Try bsb branch
shorowit May 8, 2026
082ff48
Fix pandas error
shorowit May 8, 2026
46ef391
Attempted fix to maintain previous behavior
shorowit May 8, 2026
97b3aee
Revert to develop [ci skip]
shorowit May 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/add_to_project.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ jobs:
steps:
- uses: actions/add-to-project@v1.0.0
with:
project-url: https://github.com/orgs/NREL/projects/38
project-url: https://github.com/orgs/NatLabRockies/projects/38

@shorowit shorowit May 8, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Fixes the CI failure

github-token: ${{ secrets.GHB_TOKEN }}
92 changes: 46 additions & 46 deletions .github/workflows/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
runs-on: ubuntu-24.04
steps:
- name: Checkout feature branch
uses: actions/checkout@v4
uses: actions/checkout@v6

@shorowit shorowit May 8, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Bump many GHA versions to avoid CI warnings.

with:
ref: ${{ github.head_ref || github.ref_name }}

Expand All @@ -40,7 +40,7 @@ jobs:
mv sorted_options_lookup.tsv resources/options_lookup.tsv # Sort on first two columns

- name: Upload formatted options_lookup
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: options_lookup
path: resources/options_lookup.tsv
Expand All @@ -51,7 +51,7 @@ jobs:
needs: [format-files]
steps:
- name: Checkout feature branch
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
ref: ${{ github.head_ref || github.ref_name }}

Expand All @@ -68,7 +68,7 @@ jobs:
pip3 install --progress-bar off pandas pyyaml

- name: Download formatted options_lookup
uses: actions/download-artifact@v4
uses: actions/download-artifact@v8
with:
path: resources
name: options_lookup
Expand All @@ -89,14 +89,14 @@ jobs:
python3 test/update_yml_precomputed_files.py

- name: Upload precomputed buildstocks
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: precomputed_buildstocks
path: test/tests_yml_files/yml_precomputed*/buildstock*.csv
if-no-files-found: error

- name: Upload feature samples
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: feature_samples
path: resources/buildstock.csv
Expand All @@ -106,17 +106,17 @@ jobs:
runs-on: ubuntu-24.04
steps:
- name: Checkout feature branch
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
ref: ${{ github.head_ref || github.ref_name }}

- name: Setup python
uses: actions/setup-python@v5
uses: actions/setup-python@v6
with:
python-version: '3.12'

- name: Install uv
uses: astral-sh/setup-uv@v6
uses: astral-sh/setup-uv@v8.0.0

- name: Install postprocessing dependencies
working-directory: postprocessing
Expand All @@ -134,7 +134,7 @@ jobs:
needs: [format-files]
steps:
- name: Checkout feature branch
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
ref: ${{ github.head_ref || github.ref_name }}

Expand All @@ -145,7 +145,7 @@ jobs:
sudo -E apt-get install -y wget unzip python3-sphinx-rtd-theme

- name: Download formatted options_lookup
uses: actions/download-artifact@v4
uses: actions/download-artifact@v8
with:
path: resources
name: options_lookup
Expand All @@ -172,7 +172,7 @@ jobs:
args: -pdf -latexoption=-file-line-error -latexoption=-interaction=nonstopmode -output-directory=_build

- name: Save documentation
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: documentation
path: |
Expand Down Expand Up @@ -200,7 +200,7 @@ jobs:
needs: [unit-tests]
steps:
- name: Checkout feature branch
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
ref: ${{ github.head_ref || github.ref_name }}

Expand All @@ -217,13 +217,13 @@ jobs:
pip3 install --progress-bar off pandas pyyaml

- name: Download formatted options_lookup
uses: actions/download-artifact@v4
uses: actions/download-artifact@v8
with:
path: resources
name: options_lookup

- name: Download precomputed buildstocks
uses: actions/download-artifact@v4
uses: actions/download-artifact@v8
with:
path: test/tests_yml_files
name: precomputed_buildstocks
Expand All @@ -240,7 +240,7 @@ jobs:
openstudio test/test_run_analysis.rb

- name: Upload run_analysis.rb results
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: run_analysis_results_csvs
path: |
Expand All @@ -254,25 +254,25 @@ jobs:
steps:
- name: Checkout base branch
if: github.event_name == 'pull_request'
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
ref: ${{ github.event.pull_request.base.sha }}

- name: Upload base results
if: github.event_name == 'pull_request'
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: base_results
path: test/base_results
if-no-files-found: error

- name: Checkout feature branch
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
ref: ${{ github.head_ref || github.ref_name }}

- name: Setup python
uses: actions/setup-python@v5
uses: actions/setup-python@v6
with:
python-version: '3.12'

Expand Down Expand Up @@ -309,7 +309,7 @@ jobs:
python test/process_bsb_analysis.py

- name: Upload buildstockbatch results
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: buildstockbatch_results_csvs
path: |
Expand All @@ -318,7 +318,7 @@ jobs:
if-no-files-found: error

- name: Upload raw simulation output
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: raw_simulation_output
path: |
Expand All @@ -341,19 +341,19 @@ jobs:
sudo -E apt-get install -y wget unzip python3-sphinx-rtd-theme

- name: Download feature samples
uses: actions/download-artifact@v4
uses: actions/download-artifact@v8
with:
path: samples
name: feature_samples

- name: Download formatted options_lookup
uses: actions/download-artifact@v4
uses: actions/download-artifact@v8
with:
path: resources
name: options_lookup

- name: Download precomputed buildstocks
uses: actions/download-artifact@v4
uses: actions/download-artifact@v8
with:
path: test/tests_yml_files
name: precomputed_buildstocks
Expand All @@ -380,7 +380,7 @@ jobs:

- name: Download base results
if: github.event_name == 'pull_request'
uses: actions/download-artifact@v4
uses: actions/download-artifact@v8
with:
path: base_results
name: base_results
Expand All @@ -406,7 +406,7 @@ jobs:

- name: Upload comparisons
if: github.event_name == 'pull_request'
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: comparisons
path: test/base_results/comparisons
Expand All @@ -417,18 +417,18 @@ jobs:
needs: [analysis-tests, integration-tests]
steps:
- name: Checkout feature branch
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
ref: ${{ github.head_ref || github.ref_name }}

- name: Download buildstockbatch results
uses: actions/download-artifact@v4
uses: actions/download-artifact@v8
with:
path: buildstockbatch
name: buildstockbatch_results_csvs

- name: Download run_analysis results
uses: actions/download-artifact@v4
uses: actions/download-artifact@v8
with:
path: run_analysis
name: run_analysis_results_csvs
Expand All @@ -445,7 +445,7 @@ jobs:
needs: [unit-tests]
steps:
- name: Checkout feature branch
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
ref: ${{ github.head_ref || github.ref_name }}

Expand Down Expand Up @@ -481,7 +481,7 @@ jobs:

- name: Upload 550K samples if on develop branch
if: github.ref == 'refs/heads/develop'
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: national_550ksamples
path: project_national/resources/national_550ksamples.csv.gz
Expand Down Expand Up @@ -520,7 +520,7 @@ jobs:
rm national_550ksamples.csv.gz

- name: Upload SDR options analysis artifacts
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: sdr_options_analysis
path: |
Expand Down Expand Up @@ -579,17 +579,17 @@ jobs:
needs: [sdr-options-analysis]
steps:
- name: Checkout feature branch
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
ref: ${{ github.head_ref || github.ref_name }}

- name: Setup python
uses: actions/setup-python@v5
uses: actions/setup-python@v6
with:
python-version: '3.12'

- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v4.1.0
uses: aws-actions/configure-aws-credentials@v6.1.1
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
Expand All @@ -608,7 +608,7 @@ jobs:
rm ./$OS_DEBFILE

- name: Download formatted options_lookup
uses: actions/download-artifact@v4
uses: actions/download-artifact@v8
with:
path: resources
name: options_lookup
Expand Down Expand Up @@ -656,14 +656,14 @@ jobs:
gunzip -v project_national/sdr_upgrades_amy2018/results_csvs/*.csv.gz

- name: Upload buildstockbatch results - published
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: buildstockbatch_results_sdr_published_csvs
path: project_national/sdr_upgrades_amy2018/results_csvs_pub
if-no-files-found: error

- name: Upload buildstockbatch results - raw
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: buildstockbatch_results_sdr_raw_csvs
path: project_national/sdr_upgrades_amy2018/results_csvs
Expand Down Expand Up @@ -700,7 +700,7 @@ jobs:

- name: Download base results
if: github.event_name == 'pull_request'
uses: actions/download-artifact@v4
uses: actions/download-artifact@v8
with:
path: base_results
name: base_results
Expand Down Expand Up @@ -728,7 +728,7 @@ jobs:

- name: Upload comparisons
if: github.event_name == 'pull_request'
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: sdr_comparisons
path: test/base_results/sdr_comparisons
Expand All @@ -738,12 +738,12 @@ jobs:
runs-on: ubuntu-24.04
steps:
- name: Checkout feature branch
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
ref: ${{ github.head_ref || github.ref_name }}

- name: Setup python
uses: actions/setup-python@v5
uses: actions/setup-python@v6
with:
python-version: '3.12'

Expand All @@ -760,10 +760,10 @@ jobs:
run: echo "BROWSER_PATH=${{ steps.chrome.outputs.chrome-path }}" >> $GITHUB_ENV

- name: Install uv
uses: astral-sh/setup-uv@v6
uses: astral-sh/setup-uv@v8.0.0

- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v4.1.0
uses: aws-actions/configure-aws-credentials@v6.1.1
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
Expand Down Expand Up @@ -800,7 +800,7 @@ jobs:
# uv run python resstockpostproc/upgrade_comparison/main.py

- name: Upload plots
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: plots
path: postprocessing/resstockpostproc/upgrade_comparison/sdr_plots/plots/sdr_plots_ci
Expand Down
3 changes: 3 additions & 0 deletions measures/ApplyUpgrade/measure.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,6 +406,9 @@ def halt_workflow(model, runner, measures)
return true
end

return false
end
Comment on lines +409 to +410

@shorowit shorowit May 8, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

This was the original bug I was fixing in the PR


def set_header(measures, hpxml, values)
# Whole SFA/MF Building Simulation?
measures['BuildResidentialHPXML'][0]['whole_sfa_or_mf_building_sim'] = hpxml.header.whole_sfa_or_mf_building_sim
Expand Down
Loading