Skip to content
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.

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

Develop merge #171

Merged
merged 6 commits into from
Jul 30, 2024
Merged

Develop merge #171

merged 6 commits into from
Jul 30, 2024

Conversation

dguittet
Copy link
Collaborator

copy over ci_runners changes but with DEFAULT_BRANCH=develop

dguittet and others added 6 commits June 18, 2024 17:10
* Merge in patch branch and re-target develop

* add windows build

* windows ci

* windows

* windows

* fix paths

* windows lk

* debug

* check python

* python version

* try downloading wx

* update linux

* linux

* fix syntax

* download wx

* add secrets

* tokens

* download_wx

* download_wx

* token

* msg

* fix

* cache build off

* windows

* add mac build

* fix dirs

* fix mac

* pip on mac

* pip

* mac

* fix git ls-remote

* fix mac

* mac

* update all

* windows secrets

* fix paths

* add error message

* build lk always

* fix paths

* fix paths

* fix paths

* windows

* move windows download

* clean up and fix artifacts

* use caches

* windows cache

* fix caching

* fix paths for artifacts

* fix caching path

* fix caching

* get branch name

* cleanup

* fix ssc cache

* fix windows

* use caching for wx 3.2.4

* release mode

* release ver

* fix windows path

* remove download_wx.py

* add default branch

* debug vs rel for MSVC

* select branch based on push or pull_request

---------

Co-authored-by: Brian Mirletz <brian.mirletz@nrel.gov>
@dguittet dguittet requested a review from brtietz June 20, 2024 17:07
Copy link
Collaborator

@brtietz brtietz left a comment

Choose a reason for hiding this comment

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

This looks good, sorry for the slow review!

@dguittet dguittet merged commit e38cb75 into develop Jul 30, 2024
8 checks passed
@dguittet dguittet deleted the develop_merge branch July 30, 2024 14:50
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