-
Notifications
You must be signed in to change notification settings - Fork 5.6k
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
feat(appset): Add new strategies to merge generator #21441
Open
joshfrench
wants to merge
8
commits into
argoproj:master
Choose a base branch
from
joshfrench:add-merge-strategies
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+2,163
−1,643
Conversation
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
Squashed and rebased version of argoproj#16080 no other changes introduced. Signed-off-by: Josh French <[email protected]>
✅ Preview Environment deployed on Bunnyshell
See: Environment Details | Pipeline Logs Available commands (reply to this comment):
|
Signed-off-by: Josh French <[email protected]>
Signed-off-by: Josh French <[email protected]>
Signed-off-by: Josh French <[email protected]>
Signed-off-by: Josh French <[email protected]>
Signed-off-by: Josh French <[email protected]>
`combineParamSetsByJoinType` does not handle the default case, it relies on `getJoinType` to validate and coerce input ahead of time. Remove test case that asserts otherwise. Signed-off-by: Josh French <[email protected]>
joshfrench
force-pushed
the
add-merge-strategies
branch
from
January 9, 2025 20:05
02ce69a
to
17917bb
Compare
specifically,
|
joshfrench
force-pushed
the
add-merge-strategies
branch
from
January 10, 2025 14:31
e955f53
to
10437df
Compare
Signed-off-by: Josh French <[email protected]>
joshfrench
force-pushed
the
add-merge-strategies
branch
2 times, most recently
from
January 10, 2025 14:37
81fa8bd
to
70fb97f
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
PR #16080 is abandoned. I'd like to get it into main. This is just a squashed and rebased version of that PR, with one change:
InnerJoinUnique
, but the original PR set the default toLeftJoinUnique
. I've changed the default toInnerJoinUnique
for backwards compatibility.(TBH i'm not sure what the use case is for the non-unique merge strategies. I have no objection to removing the non-unique strategies if it helps get this PR approved.)
Also, I'm having a rough time running the toolchain even after following the guide, therefore codegen has not been run. I'm hoping a maintainer can help me kick this across the finish line 🙏🏻
Fixes #11952, #12837, #14560
Checklist: