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

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

Merge pull request #12516 from webknjaz/maintenance/hotfix/gha-codeco…

e6884c8
Select commit
Loading
Failed to load commit list.
Merged

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

Merge pull request #12516 from webknjaz/maintenance/hotfix/gha-codeco…
e6884c8
Select commit
Loading
Failed to load commit list.
Patchback / Backport to 8.2.x completed Jun 22, 2024 in 5s

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

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

Details

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!