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

Jump to bottom

feat(onboarding): merge onboardingBranch into baseBranch #20893

Merged
merged 70 commits into from May 18, 2023
Merged

feat(onboarding): merge onboardingBranch into baseBranch #20893

merged 70 commits into from May 18, 2023

Conversation

RahulGautamSingh
Copy link
Collaborator

@RahulGautamSingh RahulGautamSingh commented Mar 13, 2023 •
edited

Changes

  • Merge onboardingBranch into baseBranch and perform extraction on the baseBranch
  • When branch is conflicted add a comment is added to the PR instead of updating the PR body
  • Remove dcode that automatically rebases onboardingBranch (not necessary since we merge with base branch on each run)

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 select 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 changed the title feat(onboarding): use onboarding as base for pr-body preview feat(onboarding): merge onboardingBranch into baseBranch Mar 13, 2023
@RahulGautamSingh RahulGautamSingh mentioned this pull request Mar 13, 2023
Closed
6 tasks
@RahulGautamSingh RahulGautamSingh marked this pull request as ready for review March 13, 2023 21:26
@RahulGautamSingh RahulGautamSingh requested review from rarkins and viceice and removed request for rarkins March 13, 2023 21:26
rarkins
rarkins requested changes Mar 14, 2023
View reviewed changes
lib/util/git/index.ts Outdated Show resolved Hide resolved
lib/util/git/index.ts Outdated Show resolved Hide resolved
lib/util/git/index.spec.ts Outdated Show resolved Hide resolved
lib/workers/repository/onboarding/branch/index.ts Outdated Show resolved Hide resolved
lib/workers/repository/onboarding/branch/index.ts Outdated Show resolved Hide resolved
lib/workers/repository/onboarding/branch/index.ts Outdated Show resolved Hide resolved
lib/workers/repository/onboarding/branch/index.ts Show resolved Hide resolved
lib/workers/repository/onboarding/branch/index.ts Outdated Show resolved Hide resolved
lib/workers/repository/onboarding/pr/index.ts Outdated Show resolved Hide resolved
zharinov
zharinov previously approved these changes May 10, 2023
View reviewed changes
@viceice
Copy link
Member

viceice commented May 12, 2023

We clone fresh each run though?

👉 https://docs.renovatebot.com/self-hosted-configuration/#persistrepodata

@rarkins
Copy link
Collaborator

rarkins commented May 12, 2023

We also reset the base branch sha's

rarkins
rarkins requested changes May 14, 2023
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.

Needs refactoring for the scm.getFileList() change

viceice
viceice reviewed May 15, 2023
View reviewed changes
lib/workers/repository/onboarding/branch/check.ts Outdated Show resolved Hide resolved
lib/workers/repository/onboarding/branch/check.ts Show resolved Hide resolved
lib/workers/repository/onboarding/branch/index.spec.ts Outdated Show resolved Hide resolved
lib/workers/repository/onboarding/branch/index.spec.ts Outdated Show resolved Hide resolved
lib/workers/repository/onboarding/branch/index.spec.ts Outdated Show resolved Hide resolved
lib/workers/repository/onboarding/branch/onboarding-branch-cache.spec.ts Outdated Show resolved Hide resolved
lib/workers/repository/onboarding/branch/onboarding-branch-cache.spec.ts Outdated Show resolved Hide resolved
lib/workers/repository/onboarding/branch/onboarding-branch-cache.spec.ts Outdated Show resolved Hide resolved
lib/workers/repository/onboarding/branch/onboarding-branch-cache.spec.ts Outdated Show resolved Hide resolved
lib/workers/repository/onboarding/branch/onboarding-branch-cache.spec.ts Outdated Show resolved Hide resolved
viceice
viceice reviewed May 16, 2023
View reviewed changes
Copy link
Member

@viceice viceice left a comment

Choose a reason for hiding this comment

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

just a small thing

lib/workers/repository/onboarding/branch/index.ts Show resolved Hide resolved
lib/workers/repository/onboarding/branch/index.ts Outdated Show resolved Hide resolved
@rarkins rarkins enabled auto-merge May 18, 2023 05:56
@rarkins rarkins requested review from viceice and zharinov May 18, 2023 05:56
@rarkins rarkins added this pull request to the merge queue May 18, 2023
@rarkins rarkins requested a review from HonkingGoose May 18, 2023 05:56
Merged via the queue into renovatebot:main with commit ffeb784 May 18, 2023
11 checks passed
@renovate-release
Copy link
Collaborator

🎉 This PR is included in version 35.94.0 🎉

The release is available on:

Your semantic-release bot 📦🚀

@Shegox Shegox mentioned this pull request May 22, 2023
Closed
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jun 18, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@rarkins rarkins rarkins approved these changes

@JamieMagee JamieMagee Awaiting requested review from JamieMagee

@secustor secustor Awaiting requested review from secustor

@viceice viceice Awaiting requested review from viceice

@zharinov zharinov Awaiting requested review from zharinov

@HonkingGoose HonkingGoose Awaiting requested review from HonkingGoose

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

Successfully merging this pull request may close these issues.

Preview changes to other files in onboarding branches
7 participants
@RahulGautamSingh @rarkins @zharinov @viceice @renovate-release @secustor @HonkingGoose