search

pytest-dev / pytest

The pytest framework makes it easy to write small tests, yet scales to support complex functional testing
https://pytest.org
MIT License
11.93k stars 2.65k forks source link

[PR #12516/f75e3fe6 backport][8.2.x] 🚑🧪 Set the Codecov token directly in GHA #12520

Closed patchback[bot] closed 3 months ago

patchback[bot] commented 3 months ago

This is a backport of PR #12516 as merged into main (f75e3fe63f8d22422393888bd5b9094cab35f522).

It's necessary since it seems that the currently used Codecov uploader doesn't read the token from the config sometimes.

This is a follow-up for #12508 which wasn't enough.

patchback[bot] commented 3 months ago

Backport to 8.2.x: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 8985f0475c6918836f784541fd3f6c780c9d46b4 on top of patchback/backports/8.2.x/8985f0475c6918836f784541fd3f6c780c9d46b4/pr-12520

Backporting merged PR #12520 into 8.2.x

  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/pytest-dev/pytest.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/8.2.x/8985f0475c6918836f784541fd3f6c780c9d46b4/pr-12520 upstream/8.2.x
  4. Now, cherry-pick PR #12520 contents into that branch: 
    $ git cherry-pick -x 8985f0475c6918836f784541fd3f6c780c9d46b4

    If it'll yell at you with something like fatal: Commit 8985f0475c6918836f784541fd3f6c780c9d46b4 is a merge but no -m option was given., add -m 1 as follows instead:

    $ git cherry-pick -m1 -x 8985f0475c6918836f784541fd3f6c780c9d46b4
  5. At this point, you'll probably encounter some merge conflicts. You must resolve them in to preserve the patch from PR #12520 as close to the original as possible.
  6. Push this branch to your fork on GitHub: 
    $ git push origin patchback/backports/8.2.x/8985f0475c6918836f784541fd3f6c780c9d46b4/pr-12520
  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.