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

Setup binary builds for Alpine and MacOS arm #6139

Merged
merged 10 commits into from
Oct 27, 2021
Merged

Setup binary builds for Alpine and MacOS arm #6139

merged 10 commits into from
Oct 27, 2021

Conversation

asvetlov
Copy link
Member

No description provided.

@asvetlov asvetlov requested a review from webknjaz as a code owner October 27, 2021 12:16
.github/workflows/ci.yml Outdated Show resolved Hide resolved
@asvetlov
Copy link
Member Author

@webknjaz Any idea why the chronographer didn't catch CHANGES files?

CHANGES/6139.1.feature Outdated Show resolved Hide resolved
CHANGES/6139.2.feature Outdated Show resolved Hide resolved
asvetlov and others added 2 commits October 27, 2021 15:28
Co-authored-by: Sviatoslav Sydorenko <[email protected]>
Co-authored-by: Sviatoslav Sydorenko <[email protected]>
@codecov
Copy link

codecov bot commented Oct 27, 2021

Codecov Report

Merging #6139 (f349b0f) into master (45c38f2) will decrease coverage by 0.00%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #6139      +/-   ##
==========================================
- Coverage   93.32%   93.32%   -0.01%     
==========================================
  Files         102      102              
  Lines       30140    30166      +26     
  Branches     2696     2699       +3     
==========================================
+ Hits        28129    28151      +22     
- Misses       1837     1840       +3     
- Partials      174      175       +1     
Flag Coverage Δ
unit 93.25% <ø> (-0.01%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
aiohttp/web_fileresponse.py 97.93% <0.00%> (-0.69%) ⬇️
tests/test_web_sendfile_functional.py 99.09% <0.00%> (-0.53%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 45c38f2...f349b0f. Read the comment docs.

@webknjaz
Copy link
Member

@asvetlov

@webknjaz Any idea why the chronographer didn't catch CHANGES files?

Because you named them wrong. The number should go after the type.
CHANGES/6139.1.feature -> CHANGES/6139.feature.1.

By the way, we now have a Sphinx integration that also shows unreleased change notes. See https://aiohttp--6139.org.readthedocs.build/en/6139/changes.html#to-be-included-in-vrelease-if-present.

Look closer and you'll see that your names confused Towncrier and it linked issues #1 and #2 to your change notes and not #6139.

@asvetlov
Copy link
Member Author

Aha, thanks!

@psf-chronographer psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Oct 27, 2021
@asvetlov asvetlov merged commit 00d5286 into master Oct 27, 2021
@asvetlov asvetlov deleted the build branch October 27, 2021 19:02
@patchback
Copy link
Contributor

patchback bot commented Oct 27, 2021

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

❌ Failed to cleanly apply 00d5286 on top of patchback/backports/3.8/00d52864eeea43d18ad022c7cb0e80d9741e32b9/pr-6139

Backporting merged PR #6139 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/00d52864eeea43d18ad022c7cb0e80d9741e32b9/pr-6139 upstream/3.8
  4. Now, cherry-pick PR Setup binary builds for Alpine and MacOS arm #6139 contents into that branch:
    $ git cherry-pick -x 00d52864eeea43d18ad022c7cb0e80d9741e32b9
    If it'll yell at you with something like fatal: Commit 00d52864eeea43d18ad022c7cb0e80d9741e32b9 is a merge but no -m option was given., add -m 1 as follows intead:
    $ git cherry-pick -m1 -x 00d52864eeea43d18ad022c7cb0e80d9741e32b9
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Setup binary builds for Alpine and MacOS arm #6139 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.8/00d52864eeea43d18ad022c7cb0e80d9741e32b9/pr-6139
  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.

@aio-libs-github-bot
Copy link
Contributor

💔 Backport was not successful

The PR was attempted backported to the following branches:

  • ❌ 3.8: Commit could not be cherrypicked due to conflicts

asvetlov added a commit that referenced this pull request Oct 27, 2021
@asvetlov
Copy link
Member Author

Backported by d8efd32

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bot:chronographer:provided There is a change note present in this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants