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

fix: Bitbucket Cloud PR Author is processed correctly (#20769) #20990

Conversation

andrii-korotkov-verkada
Copy link
Contributor

@andrii-korotkov-verkada andrii-korotkov-verkada commented Nov 28, 2024

Fixes #20769

Author there is a struct, not a string. Use nickname from that struct as an author name.

Let's cherry pick to 2.11-2.13

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).

Fixes argoproj#20769

Author there is a struct, not a string. Use nickname from that struct as an author name.

Let's cherry pick to 2.11-2.13

Signed-off-by: Andrii Korotkov <[email protected]>
@andrii-korotkov-verkada andrii-korotkov-verkada requested a review from a team as a code owner November 28, 2024 12:35
Copy link

bunnyshell bot commented Nov 28, 2024

❌ Preview Environment deleted from Bunnyshell

Available commands (reply to this comment):

  • 🚀 /bns:deploy to deploy the environment

Copy link

codecov bot commented Nov 28, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Please upload report for BASE (master@8bce61e). Learn more about missing BASE report.
Report is 26 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff            @@
##             master   #20990   +/-   ##
=========================================
  Coverage          ?   55.03%           
=========================================
  Files             ?      324           
  Lines             ?    55466           
  Branches          ?        0           
=========================================
  Hits              ?    30527           
  Misses            ?    22329           
  Partials          ?     2610           

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

Copy link
Member

@ishitasequeira ishitasequeira left a comment

Choose a reason for hiding this comment

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

LGTM!!

@ishitasequeira ishitasequeira merged commit b8e118f into argoproj:master Dec 3, 2024
33 checks passed
@ishitasequeira
Copy link
Member

/cherry-pick release-2.11

@ishitasequeira
Copy link
Member

/cherry-pick release-2.12

Copy link

Cherry-pick failed with Merge error b8e118ff7d08176538e48b09405d162e5ad31eec into temp-cherry-pick-9fc65c-release-2.11

@ishitasequeira
Copy link
Member

/cherry-pick release-2.13

Copy link

Cherry-pick failed with Merge error b8e118ff7d08176538e48b09405d162e5ad31eec into temp-cherry-pick-9fc65c-release-2.12

gcp-cherry-pick-bot bot pushed a commit that referenced this pull request Dec 3, 2024
Fixes #20769

Author there is a struct, not a string. Use nickname from that struct as an author name.

Let's cherry pick to 2.11-2.13

Signed-off-by: Andrii Korotkov <[email protected]>
@ishitasequeira
Copy link
Member

@andrii-korotkov-verkada seems like cherry-pick failed for 2.11 and 2.12. Would you be able to create cherry-pick PRs manually?

@andrii-korotkov-verkada
Copy link
Contributor Author

@ishitasequeira, do you know how to fork specific tags? I've tried to find an option in my existing fork, but couldn't.

@ishitasequeira
Copy link
Member

@andrii-korotkov-verkada , what I usually do is checkout to the target branch, create a new branch, and then cherry-pick the specific commit to that branch. All of this on my fork.

The command I use to cherry-pick:

git cherry-pick -x <commit-sha>

Let me know if that helps.

ishitasequeira pushed a commit that referenced this pull request Dec 3, 2024
… (#21039)

Fixes #20769

Author there is a struct, not a string. Use nickname from that struct as an author name.

Let's cherry pick to 2.11-2.13

Signed-off-by: Andrii Korotkov <[email protected]>
Co-authored-by: Andrii Korotkov <[email protected]>
@andrii-korotkov-verkada
Copy link
Contributor Author

@ishitasequeira, did you clone with all branches? I think I only have master and my own branches in my fork.

@ishitasequeira
Copy link
Member

@ishitasequeira, did you clone with all branches? I think I only have master and my own branches in my fork.

You do not need to pull in all branches. You can pull in only the specific release branches that are needed.

For e.g.

git pull upstream release-2.12

@andrii-korotkov-verkada
Copy link
Contributor Author

Thanks! Looks like the author field for Bitbucket was added only in 2.13, that's why cherry pick failed. I think we can still do it, just would be more like adding a small feature.

@andrii-korotkov-verkada
Copy link
Contributor Author

Ah, nvm, PullRequest doesn't have a field for Author either. Let's skip 2.11 and 2.12 then.

adriananeci pushed a commit to adriananeci/argo-cd that referenced this pull request Dec 4, 2024
argoproj#20990)

Fixes argoproj#20769

Author there is a struct, not a string. Use nickname from that struct as an author name.

Let's cherry pick to 2.11-2.13

Signed-off-by: Andrii Korotkov <[email protected]>
Signed-off-by: Adrian Aneci <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

Pull Request generator not working for Bitbucket Cloud
2 participants