Skip to content

💅 Add a config for the Patchback GitHub App#12475

Merged
nicoddemus merged 1 commit intopytest-dev:mainfrom
webknjaz:maintenance/patchback-config
Jun 19, 2024
Merged

💅 Add a config for the Patchback GitHub App#12475
nicoddemus merged 1 commit intopytest-dev:mainfrom
webknjaz:maintenance/patchback-config

Conversation

@webknjaz
Copy link
Member

This patch prepares the project's backporting process to start being handled by the Patchback GitHub App [1].

Ref #9384
Resolves #9385
Resolves #9553
Resolves #9554
Resolves #9555

This patch prepares the project's backporting process to start being
handled by the Patchback GitHub App [[1]].

Ref pytest-dev#9384
Resolves pytest-dev#9385
Resolves pytest-dev#9553
Resolves pytest-dev#9554
Resolves pytest-dev#9555

[1]: https://github.com/apps/patchback
@nicoddemus
Copy link
Member

Thanks @webknjaz, do we have any documentation on how the patchback works?

I assume we just apply the "backport" label at any moment in the PR lifetime, and once it gets merged, it will open a PR backporting the merged change to the correct branch?

@nicoddemus
Copy link
Member

@webknjaz
Copy link
Member Author

Should we also remove main/.github/workflows/backport.yml?

Not yet. Ronny and I agreed to keep it for a while.

@webknjaz
Copy link
Member Author

@nicoddemus

do we have any documentation on how the patchback works?

Not really, but the source code is pretty clear, I think.
I posted about how it works in #9554 (comment) and never got to writing anything more on the topic.
https://github.com/sanitizers/patchback-github-app — there's some feature requests in the issues that I never got to but I think would be useful too.

I assume we just apply the "backport" label at any moment in the PR lifetime, and once it gets merged, it will open a PR backporting the merged change to the correct branch?

Yep, that's it. It should be a drop-in replacement with no change in how it's used (except for having a few more features than the current workflow).

@webknjaz
Copy link
Member Author

For this, install https://github.com/apps/patchback/installations/new/permissions?target_id=8897583&target_type=Organization. You should't need to wait until the PR is merged.

Copy link
Member

@nicoddemus nicoddemus left a comment

Choose a reason for hiding this comment

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

Thanks @webknjaz for the info!

@nicoddemus nicoddemus enabled auto-merge (squash) June 18, 2024 23:37
@nicoddemus nicoddemus merged commit d7b4010 into pytest-dev:main Jun 19, 2024
@patchback
Copy link

patchback bot commented Jun 19, 2024

Backport to 8.2.x: 💚 backport PR created

✅ Backport PR branch: patchback/backports/8.2.x/d7b401063874141fcbcda78eaec3c28148e7dcd8/pr-12475

Backported as #12480

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

patchback bot pushed a commit that referenced this pull request Jun 19, 2024
This patch prepares the project's backporting process to start being
handled by the Patchback GitHub App [[1]].

Ref #9384
Resolves #9385
Resolves #9553
Resolves #9554
Resolves #9555

[1]: https://github.com/apps/patchback

(cherry picked from commit d7b4010)
RonnyPfannschmidt added a commit that referenced this pull request Jun 19, 2024
…7b401063874141fcbcda78eaec3c28148e7dcd8/pr-12475

[PR #12475/d7b40106 backport][8.2.x] 💅 Add a config for the Patchback GitHub App
webknjaz added a commit to webknjaz/pytest that referenced this pull request Jun 19, 2024
Previously, this workflow was being used to cherry-pick PRs made
against `main` into older stable branches. Now that pytest-dev#12475 integrated
the Patchback GitHub App, it's no longer needed as it's making
duplicate pull requests which don't even trigger CI runs automatically
due to pytest-dev#10354. So this patch removes said workflow to address the
problem.
@bluetech
Copy link
Member

Thanks for fixing this, the old setup was quite annoying :)

Glyphack pushed a commit to Glyphack/pytest that referenced this pull request Jun 20, 2024
This patch prepares the project's backporting process to start being
handled by the Patchback GitHub App [[1]].

Ref pytest-dev#9384
Resolves pytest-dev#9385
Resolves pytest-dev#9553
Resolves pytest-dev#9554
Resolves pytest-dev#9555

[1]: https://github.com/apps/patchback
Glyphack pushed a commit to Glyphack/pytest that referenced this pull request Jun 20, 2024
Previously, this workflow was being used to cherry-pick PRs made
against `main` into older stable branches. Now that pytest-dev#12475 integrated
the Patchback GitHub App, it's no longer needed as it's making
duplicate pull requests which don't even trigger CI runs automatically
due to pytest-dev#10354. So this patch removes said workflow to address the
problem.
@webknjaz
Copy link
Member Author

No problem! I would've done this earlier if it was greenlighted..

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

type: infrastructure improvement to development/releases/CI structure

Projects

Status: Done

4 participants