Skip to content

Conversation

@brtietz
Copy link
Collaborator

@brtietz brtietz commented Aug 25, 2024

Resolve conflicts between wxwidgets version and patch/develop branch flag

sjanzou and others added 23 commits August 8, 2024 03:55
Improve UI callback messages
Help revision MPST Tower and Receiver total piping loss equation
* fix ci for PR vs push

* fix ci

* fix typo

* update for mac
* intel and arm mac to ci

* use caching

* fix wx version

* shorten for only wxWidgets cache

* restore

* fix order

* update mac

* update build

* shorten

* add windows build

* fix cache names

* add msbuild to path

* wx cache windows

* restore

* use pwsh

* pwsh

* windows

* windows

* fix paths windows

* windows cd

* wex windows

* Update ci.yml

* run sam test

* fix ci

* list ubuntu

* add default branch

* redo cache

* add back in sam build

* ubuntu build

* msbuild arch

* fix python ver

* regen cache

* build sam

* add shared to SAM

* update sam test cmd windows

* check windows

* make temp cache of sam

* try RunProcess

* fix unzip

* runprocess

* print

* try

* headless

* rebuild caches

* try headless

* fix path

* try test script

* hide window

* try sdktool w/o window

* kill

* fix ci for PR vs push

* fix ci

* fix typo

* Don't try headless SAM on windows

* set default branch for pull_request

* update for mac
When REopt API returns null battery size and user clicks **Yes** when asked whether to set battery size to zero, set battery size to zero instead of resetting to original size.
Addresses SAM issue 1830
@brtietz brtietz merged commit 74731cc into develop Aug 25, 2024
@brtietz brtietz deleted the patch_to_develop_240825 branch December 13, 2024 19:22
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.

5 participants