-
Notifications
You must be signed in to change notification settings - Fork 25
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
Ci runners #169
Merged
+302
−39
Merged
Ci runners #169
Changes from 59 commits
Commits
Show all changes
63 commits
Select commit
Hold shift + click to select a range
d81c2b1
Merge in patch branch and re-target develop
brtietz 65866a1
Merge pull request #168 from NREL/patch_to_develop_w_ci
brtietz 932a6ad
add windows build
dguittet 4fb7abe
windows ci
dguittet 3093659
windows
dguittet dc311ac
windows
dguittet 93c3c1e
fix paths
dguittet 391fac8
windows lk
dguittet f831e2c
debug
dguittet a029e32
check python
dguittet d60c696
python version
dguittet 7e10a3f
try downloading wx
dguittet b6a2f01
update linux
dguittet 861e0a9
linux
dguittet 052204a
fix syntax
dguittet bdc6259
download wx
dguittet 2c6af7b
add secrets
dguittet 9a91be9
tokens
dguittet e756be2
download_wx
dguittet e92072b
download_wx
dguittet 7013dd2
token
dguittet 800b490
msg
dguittet d0323a9
fix
dguittet 7327890
cache build off
dguittet bbbeebb
windows
dguittet e59477d
add mac build
dguittet 602ff8a
fix dirs
dguittet e4dd805
fix mac
dguittet 6e80b22
pip on mac
dguittet c143994
pip
dguittet 49c9ff4
mac
dguittet 6030324
fix git ls-remote
dguittet b5535f2
fix mac
dguittet 09e779a
mac
dguittet c1e0539
update all
dguittet 6014fd5
windows secrets
dguittet 43e22a6
fix paths
dguittet d83cf3d
add error message
dguittet 29a8ab5
build lk always
dguittet 117b10e
fix paths
dguittet a4662ec
fix paths
dguittet 8f77c5c
fix paths
dguittet bbf0b67
windows
dguittet 5fbda4f
move windows download
dguittet 14d78f0
clean up and fix artifacts
dguittet a03f282
use caches
dguittet d8c7cab
windows cache
dguittet aeee722
fix caching
dguittet 3e50ebd
fix paths for artifacts
dguittet a0b67aa
fix caching path
dguittet 632559f
fix caching
dguittet cb63a70
get branch name
dguittet de98735
cleanup
dguittet 11d729b
fix ssc cache
dguittet 37d9a7c
fix windows
dguittet 4dbb1b5
use caching for wx 3.2.4
dguittet 01bb928
release mode
dguittet 1ddbe87
release ver
dguittet 7c09402
fix windows path
dguittet 16d26c4
remove download_wx.py
dguittet 4382f36
add default branch
dguittet db71c0a
debug vs rel for MSVC
dguittet 6502153
select branch based on push or pull_request
dguittet File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks like there will be a branch mismatch between patch and develop. Should this be patch?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How is this "base" branch handled? Are there different
ci.yml
for each branch?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For events triggered by
pull_request
, then you have the pull request merge branch, but for the standalonepush
, how should the default branch be determined as develop or patch?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Currently in SAM's patch branch, the base branch is also develop: https://github.com/NREL/SAM/blob/1ed59e9b181cf1f23d7ac1f696b5cb91805c7936/.github/workflows/ci.yml#L70
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That's not intentional: NREL/SAM#1664 I'm not sure how that got reverted but it should be patch.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Branches from patch should have patch as the default in the CI script, whereas branches from develop should have develop.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, that is clear. My question was mechanistic. I may just have two versions of ci.yml on each branch.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Most years, a commit when we switch from patch to develop (and vice versa) has been sufficient, but as we see right now it's error prone. How would two ci.yml instances work?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This might be a bad idea but I was thinking we'd have a different version of ci.yml on each branch. I think then the first time we merge patch into develop, we have to manually unselect the changes in ci.yml. But then after that, that difference won't be a tracked diff, and shouldn't show up. I'm not 100% sure it'll work but I could try.
There kind of is a way to get the "closest parent branch" but it uses a lot of bash magic (that I don't understand) and might be unreliable.