Skip to content

Bump reusable-tox.yml to 1bb961580e#827

Merged
webknjaz merged 1 commit into
cherrypy:mainfrom
julianz-:bump-tox-dev-workflow
Jun 23, 2026
Merged

Bump reusable-tox.yml to 1bb961580e#827
webknjaz merged 1 commit into
cherrypy:mainfrom
julianz-:bump-tox-dev-workflow

Conversation

@julianz-

Copy link
Copy Markdown
Member

Updates the reusable-tox workflow to pick up the codecov/codecov-action bump which is required after Codecov migrated to a new GPG key following its acquisition by Harness.

What kind of change does this PR introduce?

  • 🐞 bug fix
  • 🐣 feature
  • 📋 docs update
  • 📋 tests/coverage improvement
  • 📋 refactoring
  • 💥 other

📋 What is the related issue number (starting with #)

Resolves #

What is the current behavior? (You can also link to an open issue here)

What is the new behavior (if this is a feature change)?

📋 Other information:

📋 Contribution checklist:

(If you're a first-timer, check out
[this guide on making great pull requests][making a lovely PR])

  • I wrote descriptive pull request text above
  • I think the code is well written
  • I wrote [good commit messages]
  • I have [squashed related commits together][related squash] after
    the changes have been approved
  • Unit tests for the changes exist
  • Integration tests for the changes exist (if applicable)
  • I used the same coding conventions as the rest of the project
  • The new code doesn't generate linter offenses
  • Documentation reflects the changes
  • The PR relates to only one subject with a clear title
    and description in grammatically correct, complete sentences

Updates the tox workflow to pick up the codecov/codecov-action
bump required after Codecov migrated to a new GPG key following the
Sentry->Harness acquisition.
@read-the-docs-community

Copy link
Copy Markdown

Documentation build overview

📚 cheroot | 🛠️ Build #33232715 | 📁 Comparing c0d40b7 against latest (18f4ba8)

  🔍 Preview build  

2 files changed
± history/index.html
± pkg/cheroot.server/index.html

@codecov

codecov Bot commented Jun 21, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 78.15%. Comparing base (18f4ba8) to head (c0d40b7).
✅ All tests successful. No failed tests found.

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #827      +/-   ##
==========================================
- Coverage   78.19%   78.15%   -0.05%     
==========================================
  Files          41       41              
  Lines        4788     4788              
  Branches      547      547              
==========================================
- Hits         3744     3742       -2     
  Misses        905      905              
- Partials      139      141       +2     

@julianz- julianz- requested a review from webknjaz June 21, 2026 18:17

@webknjaz webknjaz left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks!

@webknjaz webknjaz enabled auto-merge June 21, 2026 18:45
@webknjaz webknjaz added backport-8.x 🤖 Trigger automatic backporting into the `maint/8.x` release branch by the Patchback robot backport-10.0.x 🤖 Trigger automatic backporting into the `maint/10.0.x` release branch by the Patchback robot backport-11.0.x 🤖 Trigger automatic backporting into the `maint/11.0.x` release branch by the Patchback robot bot:chronographer:skip A mark meaning no public change log needed for the patch. labels Jun 21, 2026
@webknjaz webknjaz disabled auto-merge June 23, 2026 13:52
@webknjaz

Copy link
Copy Markdown
Member

Since this is blocked by #828, I'll force-merge it for now.

@webknjaz webknjaz merged commit 3937fe1 into cherrypy:main Jun 23, 2026
91 of 158 checks passed
@patchback

This comment was marked as resolved.

@patchback

This comment was marked as resolved.

@patchback

patchback Bot commented Jun 23, 2026

Copy link
Copy Markdown

Backport to maint/11.0.x: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 3937fe1 on top of patchback/backports/maint/11.0.x/3937fe1e24360b65b9deebf4f20febcaffe96613/pr-827

Backporting merged PR #827 into main

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/cherrypy/cheroot.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/maint/11.0.x/3937fe1e24360b65b9deebf4f20febcaffe96613/pr-827 upstream/maint/11.0.x
  4. Now, cherry-pick PR Bump reusable-tox.yml to 1bb961580e #827 contents into that branch:
    $ git cherry-pick -x 3937fe1e24360b65b9deebf4f20febcaffe96613
    If it'll yell at you with something like fatal: Commit 3937fe1e24360b65b9deebf4f20febcaffe96613 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 3937fe1e24360b65b9deebf4f20febcaffe96613
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Bump reusable-tox.yml to 1bb961580e #827 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/maint/11.0.x/3937fe1e24360b65b9deebf4f20febcaffe96613/pr-827
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

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

@webknjaz webknjaz removed backport-8.x 🤖 Trigger automatic backporting into the `maint/8.x` release branch by the Patchback robot backport-10.0.x 🤖 Trigger automatic backporting into the `maint/10.0.x` release branch by the Patchback robot labels Jun 23, 2026
@webknjaz

Copy link
Copy Markdown
Member

@julianz- could you see if this can be backported into the v11.0.x maintenance branch? It's not mandatory but if infra sync isn't too difficult to keep the same, it's better for the logic not to divert too much.

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

Labels

backport-11.0.x 🤖 Trigger automatic backporting into the `maint/11.0.x` release branch by the Patchback robot bot:chronographer:skip A mark meaning no public change log needed for the patch.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants