Skip to content

Fix base branch in Github CI#1779

Merged
dguittet merged 4 commits into
patchfrom
ci_ref_branch
Jun 18, 2024
Merged

Fix base branch in Github CI#1779
dguittet merged 4 commits into
patchfrom
ci_ref_branch

Conversation

@dguittet

@dguittet dguittet commented May 29, 2024

Copy link
Copy Markdown
Collaborator

Use base (destination) branch for pull_request, but try to find matching branch for push

@dguittet dguittet marked this pull request as ready for review May 29, 2024 21:56
@dguittet dguittet requested a review from brtietz May 29, 2024 21:56

@brtietz brtietz left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Looks great, thank you! Do any other repos need a similar treatment?

@dguittet dguittet mentioned this pull request Jun 18, 2024
@dguittet dguittet merged commit 9c3c383 into patch Jun 18, 2024
@dguittet dguittet deleted the ci_ref_branch branch June 18, 2024 16:26
This was referenced Jun 18, 2024
@dguittet

dguittet commented Jun 18, 2024

Copy link
Copy Markdown
Collaborator Author

@brtietz Yes, wex has this already for patch. I'll set up the same ci.yml change for develop.

edit: ssc and lk don't require other branches so don't need this

dguittet added a commit that referenced this pull request Jun 25, 2024
* Update lhs.bin and stepwise.bin to address #1417

* Not sure why GitHub Actions failing when Mac binaries only thing updated

* Fix base branch for GitHub Actions - patch

* Rerun defaults on Windows for failing GitHub Actions

* Fix indifference point macro description (#1788)

* Update PV PDF report templates (#1789)

* Fix Federal depreciation calculation in host_developer.xlsx (#1793)

Cell CashFlow!B398 incorrectly referred to $C$141 for federal custom depreciation allocation which caused divide by zero errors that propagated through workbook all the way to LCOE and NPV results.

This issue only affected Host Developer send-to-Excel with equations when 20-yr SL allocation (Inputs!C141) is set to zero.

Checked that all other FOM spreadsheets do not have this problem.

* UI message for battery grid charging with PBI (#1792)

Also trigger message on_change so message appears when you switch to Battery Dispatch pages.

* Marine Energy documentation revisions (#1790)

* Fix base branch in Github CI (#1779)

* fix base branch

* fix ref name

* set default branch to patch

* update test results

---------

Co-authored-by: sjanzou <sjanzou@gmail.com>
Co-authored-by: Steven Janzou <steven@janzouconsulting.com>
Co-authored-by: Paul Gilman <cpaulgilman@gmail.com>
dguittet added a commit that referenced this pull request Jun 25, 2024
* Update lhs.bin and stepwise.bin to address #1417

* Not sure why GitHub Actions failing when Mac binaries only thing updated

* Fix base branch for GitHub Actions - patch

* Rerun defaults on Windows for failing GitHub Actions

* Fix indifference point macro description (#1788)

* Update PV PDF report templates (#1789)

* Update PV Tracking and Orientation diagram

Old version was misleading for one-axis trackers.

Delete extra copies of image file.

* Update documentation for PV tracking and orientation

* Revise PVWatts tilt and azimuth descriptions

* Fix Federal depreciation calculation in host_developer.xlsx (#1793)

Cell CashFlow!B398 incorrectly referred to $C$141 for federal custom depreciation allocation which caused divide by zero errors that propagated through workbook all the way to LCOE and NPV results.

This issue only affected Host Developer send-to-Excel with equations when 20-yr SL allocation (Inputs!C141) is set to zero.

Checked that all other FOM spreadsheets do not have this problem.

* UI message for battery grid charging with PBI (#1792)

Also trigger message on_change so message appears when you switch to Battery Dispatch pages.

* Marine Energy documentation revisions (#1790)

* Fix base branch in Github CI (#1779)

* fix base branch

* fix ref name

* set default branch to patch

* Address hybrid SAM lk scripting issues in #1636

* Squashed commit of the following:

commit c5f39d5
Author: Paul Gilman <cpaulgilman@gmail.com>
Date:   Fri Jun 14 16:13:53 2024 -0700

    Fix CEC Help topic

commit d44d433
Author: Paul Gilman <cpaulgilman@gmail.com>
Date:   Fri Jun 14 16:00:05 2024 -0700

    Help revisions for PV temperature, spectral, and optical models

    * Revise IEC 61853 topic to explain temperature, spectral, and optical models.

    * Add note for CEC model to explain air mass model.

commit 05581df
Author: Paul Gilman <cpaulgilman@gmail.com>
Date:   Fri Jun 14 15:58:13 2024 -0700

    UI fixes for PV optical and spectral models

    * Display all available data for Sandia module model so users can see model coefficient values in UI without opening library CSV file.

    * Improve labeling of inputs for IEC 61853 module model

* Improve Documentation of IEC 61858 temperature, optical, and spectral models (#1795)

* UI fixes for PV optical and spectral models

* Display all available data for Sandia module model so users can see model coefficient values in UI without opening library CSV file.

* Improve labeling of inputs for IEC 61853 module model

* Help revisions for PV temperature, spectral, and optical models

* Revise IEC 61853 topic to explain temperature, spectral, and optical models.

* Add note for CEC model to explain air mass model.

* Fix CEC Help topic

* Improve lk select_inputs() function description

* revert test_results_win64.csv

---------

Co-authored-by: sjanzou <sjanzou@gmail.com>
Co-authored-by: Steven Janzou <steven@janzouconsulting.com>
Co-authored-by: Paul Gilman <cpaulgilman@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants