Skip to content

fix: cherrypick semver fix #20096 into 2.12#20215

Merged
pasha-codefresh merged 4 commits intoargoproj:release-2.12from
PaulSonOfLars:paul/fix-semver-into-2.12
Oct 10, 2024
Merged

fix: cherrypick semver fix #20096 into 2.12#20215
pasha-codefresh merged 4 commits intoargoproj:release-2.12from
PaulSonOfLars:paul/fix-semver-into-2.12

Conversation

@PaulSonOfLars
Copy link
Copy Markdown
Contributor

@PaulSonOfLars PaulSonOfLars commented Oct 3, 2024

Checklist:

  • Either (a) I've created an enhancement proposal and discussed it with the community, (b) this is a bug fix, or (c) this does not need to be in the release notes.
  • The title of the PR states what changed and the related issues number (used for the release note).
  • The title of the PR conforms to the Toolchain Guide
  • I've included "Closes [ISSUE #]" or "Fixes [ISSUE #]" in the description to automatically close the associated issue.
  • I've updated both the CLI and UI to expose my feature, or I plan to submit a second PR with them.
  • Does this PR require documentation updates?
  • I've updated documentation as required by this PR.
  • I have signed off all my commits as required by DCO
  • I have written unit and/or e2e tests for my change. PRs without these are unlikely to be merged.
  • My build is green (troubleshooting builds).
  • My new feature complies with the feature status guidelines.
  • I have added a brief description of why this PR is necessary and/or what this PR solves.
  • Optional. My organization is added to USERS.md.
  • Optional. For bug fixes, I've indicated what older releases this fix should be cherry-picked into (this may or may not happen depending on risk/complexity).

@PaulSonOfLars
cherrypick
d8e3c0e 
Signed-off-by: Paul Larsen <pnvlarsen@gmail.com>
@PaulSonOfLars PaulSonOfLars requested review from a team as code owners October 3, 2024 17:17
@PaulSonOfLars PaulSonOfLars mentioned this pull request Oct 3, 2024
Merged
14 tasks
@PaulSonOfLars PaulSonOfLars changed the title cherrypick semver fix #20096 into 2.12 fix: cherrypick semver fix #20096 into 2.12 Oct 3, 2024
@PaulSonOfLars PaulSonOfLars force-pushed the paul/fix-semver-into-2.12 branch from 2d08bc9 to d8e3c0e Compare October 3, 2024 17:18
blakepettersson
blakepettersson reviewed Oct 4, 2024
View reviewed changes
blakepettersson
blakepettersson approved these changes Oct 4, 2024
View reviewed changes
Copy link
Copy Markdown
Member

@blakepettersson blakepettersson left a comment

Choose a reason for hiding this comment

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

Minor issue otherwise LGTM

@PaulSonOfLars @blakepettersson
Update util/git/client_test.go
1d5f86c 
Co-authored-by: Blake Pettersson <blake.pettersson@gmail.com>
Signed-off-by: Paul Larsen <pnvlarsen@gmail.com>
@blakepettersson blakepettersson added the ready-for-review An approver should give a final review and merge the PR label Oct 4, 2024
todaywasawesome
todaywasawesome approved these changes Oct 4, 2024
View reviewed changes
Copy link
Copy Markdown
Contributor

@todaywasawesome todaywasawesome left a comment

Choose a reason for hiding this comment

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

Thanks for resolving LGTM

pasha-codefresh
pasha-codefresh requested changes Oct 6, 2024
View reviewed changes
Copy link
Copy Markdown
Member

@pasha-codefresh pasha-codefresh left a comment

Choose a reason for hiding this comment

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

Please fix linter issues

@PaulSonOfLars
rm bad metrics cherry pick
d34afbe 
Signed-off-by: Paul Larsen <pnvlarsen@gmail.com>
@codecov
Copy link
Copy Markdown

codecov bot commented Oct 7, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 50.35%. Comparing base (a05b042) to head (c76bf56).
Report is 25 commits behind head on release-2.12.

Additional details and impacted files 
@@              Coverage Diff              @@
##           release-2.12   #20215   +/-   ##
=============================================
  Coverage         50.35%   50.35%           
=============================================
  Files               313      313           
  Lines             43155    43155           
=============================================
+ Hits              21729    21731    +2     
- Misses            18939    18942    +3     
+ Partials           2487     2482    -5

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@PaulSonOfLars
Copy link
Copy Markdown
Contributor Author

PaulSonOfLars commented Oct 9, 2024

Not sure what the failing generated code check is about here; I don't think I've changed anything related to codegen. Let me know if there's anything in particular to run!

@blakepettersson
Copy link
Copy Markdown
Member

blakepettersson commented Oct 9, 2024

@PaulSonOfLars that is expected in the release-* branches, so you should be good to go. @pasha-codefresh does this look good to you?

@pasha-codefresh pasha-codefresh merged commit e2eb54c into argoproj:release-2.12 Oct 10, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@blakepettersson blakepettersson blakepettersson approved these changes

@todaywasawesome todaywasawesome todaywasawesome approved these changes

@pasha-codefresh pasha-codefresh pasha-codefresh approved these changes

+1 more reviewer

@christianh814 christianh814 christianh814 approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

ready-for-review An approver should give a final review and merge the PR

Projects

Argo CD Review
Archived in project

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@PaulSonOfLars @blakepettersson @todaywasawesome @christianh814 @pasha-codefresh