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.

Sign up for GitHub

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

Jump to bottom

feat: add pristine in branchCache #18478

Merged
merged 18 commits into from Nov 20, 2022
Merged

feat: add pristine in branchCache #18478

merged 18 commits into from Nov 20, 2022

Conversation

RahulGautamSingh
Copy link
Collaborator

Changes

  • delete parentSha altogether
  • add a pristine (boolean) field instead which will be used for calculating mergeConfidence

Context

Documentation (please check one with an [x])

  • I have updated the documentation, or
  • No documentation update is required

How I've tested my work (please tick one)

I have verified these changes via:

  • Code inspection only, or
  • Newly added/modified unit tests, or
  • No unit tests but ran on a real repository, or
  • Both unit tests + ran on a real repository

@RahulGautamSingh RahulGautamSingh marked this pull request as ready for review October 23, 2022 06:29
rarkins
rarkins reviewed Oct 24, 2022
View reviewed changes
Copy link
Collaborator

@rarkins rarkins left a comment

Choose a reason for hiding this comment

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

This seems much more complex than I'd expected. I thought it would just be a boolean flag, for cache only, which is set to true on a new commit and set to false whenever baseBranchSha or branchSha change without one of our commits

@rarkins
Copy link
Collaborator

rarkins commented Oct 27, 2022

Needs deconfliction

rarkins
rarkins previously approved these changes Oct 28, 2022
View reviewed changes
RahulGautamSingh and others added 3 commits October 28, 2022 21:15
@RahulGautamSingh @Gabriel-Ladzaretti
Update lib/workers/repository/finalise/repository-statistics.spec.ts
9cf8f80 
Co-authored-by: Gabriel-Ladzaretti <97394622+Gabriel-Ladzaretti@users.noreply.github.com>
@RahulGautamSingh
fix tests
72646ef
@RahulGautamSingh
Merge branch 'main' into feat/pristine
2028757
rarkins
rarkins previously approved these changes Nov 20, 2022
View reviewed changes
@rarkins rarkins enabled auto-merge (squash) November 20, 2022 06:47
@rarkins rarkins merged commit 987421b into renovatebot:main Nov 20, 2022
@renovate-release
Copy link
Collaborator

🎉 This PR is included in version 34.29.0 🎉

The release is available on:

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Dec 21, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@rarkins rarkins rarkins approved these changes

@Gabriel-Ladzaretti Gabriel-Ladzaretti Awaiting requested review from Gabriel-Ladzaretti

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Refactor parentSha/baseBranchSha logic in branch cache
5 participants
@RahulGautamSingh @rarkins @renovate-release @Gabriel-Ladzaretti @renovate-bot