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

Upgrade chat links and badges to Matrix #7345

Merged
merged 1 commit into from
Jul 7, 2023

Conversation

webknjaz
Copy link
Member

@webknjaz webknjaz commented Jul 7, 2023

No description provided.

@webknjaz webknjaz added bot:chronographer:skip This PR does not need to include a change note backport-3.8 labels Jul 7, 2023
@webknjaz webknjaz requested a review from asvetlov as a code owner July 7, 2023 22:26
@webknjaz webknjaz enabled auto-merge (squash) July 7, 2023 22:36
@webknjaz webknjaz removed the request for review from asvetlov July 7, 2023 22:36
@webknjaz webknjaz merged commit fb7a0a1 into aio-libs:master Jul 7, 2023
24 of 26 checks passed
@patchback
Copy link
Contributor

patchback bot commented Jul 7, 2023

Backport to 3.8: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply fb7a0a1 on top of patchback/backports/3.8/fb7a0a176909a8a7926c1eccf3a82023ce2c65f7/pr-7345

Backporting merged PR #7345 into master

  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/aio-libs/aiohttp.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/3.8/fb7a0a176909a8a7926c1eccf3a82023ce2c65f7/pr-7345 upstream/3.8
  4. Now, cherry-pick PR Upgrade chat links and badges to Matrix #7345 contents into that branch:
    $ git cherry-pick -x fb7a0a176909a8a7926c1eccf3a82023ce2c65f7
    If it'll yell at you with something like fatal: Commit fb7a0a176909a8a7926c1eccf3a82023ce2c65f7 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x fb7a0a176909a8a7926c1eccf3a82023ce2c65f7
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Upgrade chat links and badges to Matrix #7345 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.8/fb7a0a176909a8a7926c1eccf3a82023ce2c65f7/pr-7345
  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.

@patchback
Copy link
Contributor

patchback bot commented Jul 7, 2023

Backport to 3.9: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.9/fb7a0a176909a8a7926c1eccf3a82023ce2c65f7/pr-7345

Backported as #7347

🤖 @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 Jul 7, 2023
webknjaz added a commit that referenced this pull request Jul 8, 2023
…trix (#7347)

**This is a backport of PR #7345 as merged into master
(fb7a0a1).**

Co-authored-by: Sviatoslav Sydorenko <[email protected]>
webknjaz added a commit that referenced this pull request Jul 8, 2023
@webknjaz
Copy link
Member Author

webknjaz commented Jul 8, 2023

3.8: 9a41831

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bot:chronographer:skip This PR does not need to include a change note
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant