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

Skip autofix on pending Renovate Branches #1226

Merged
merged 11 commits into from
Jul 25, 2023
Merged

Skip autofix on pending Renovate Branches #1226

merged 11 commits into from
Jul 25, 2023

Conversation

samchungy
Copy link
Contributor

@samchungy samchungy commented Jul 24, 2023

On my run of Skuba renovate's I encountered a number of branches which had autofix commits pushed so they were stuck in Edited/Blocked.

This means that not only does the Renovate branch no longer get pushed to/updated automatically. It means I have to manually intervene and open the repository in order to see that it's stuck in Edited/Blocked.

Should we avoid pushing on skuba renovate branches unless we know there's an open PR?

Happy to be pushed back on this one.

Example

image

https://github.com/SEEK-Jobs/backoffice-budgets-api/tree/renovate-skuba-7.x

@samchungy samchungy requested review from a team as code owners July 24, 2023 08:31
@changeset-bot
Copy link

changeset-bot bot commented Jul 24, 2023

🦋 Changeset detected

Latest commit: 649b06f

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package
Name Type
skuba Minor

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

Comment on lines 88 to 90
log.warn(
'Could not find an open pull request for this branch. The autofix commit will not be applied to allow Renovate to open a pull request successfully.',
);
Copy link
Member

Choose a reason for hiding this comment

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

I'll review this proper in a bit but seems perfectly reasonable. Could we also write a Buildkite warning and share next steps (i.e. fix is available but we did not push it, if the PR has since been created then you can manually rerun the step to push).

Copy link
Member

@72636c 72636c left a comment

Choose a reason for hiding this comment

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

👏

src/cli/lint/autofix.ts Outdated Show resolved Hide resolved
src/cli/lint/autofix.ts Outdated Show resolved Hide resolved
.changeset/mighty-buttons-fry.md Outdated Show resolved Hide resolved
samchungy and others added 2 commits July 25, 2023 22:33
Co-authored-by: Ryan Ling <ryan@outlook.com.au>
@samchungy samchungy changed the title Skip autofix when renovate branch does not have an open PR Skip autofix on Renovate Branch Jul 25, 2023
@samchungy samchungy changed the title Skip autofix on Renovate Branch Skip autofix on pending Renovate Branches Jul 25, 2023
@samchungy samchungy merged commit 249525b into master Jul 25, 2023
19 checks passed
@samchungy samchungy deleted the skip-autofix branch July 25, 2023 23:58
@seek-oss-ci seek-oss-ci mentioned this pull request Jul 25, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants