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

Bump alpine to 3.20 #1621

Merged
merged 3 commits into from
Aug 9, 2024
Merged

Bump alpine to 3.20 #1621

merged 3 commits into from
Aug 9, 2024

Conversation

PromoFaux
Copy link
Member

What does this PR aim to accomplish?:

Update Alpine base from 3.19 to 3.20


By submitting this pull request, I confirm the following:

  1. I have read and understood the contributors guide, as well as this entire template. I understand which branch to base my commits and Pull Requests against.
  2. I have commented my proposed changes within the code and I have tested my changes.
  3. I am willing to help maintain this change if there are issues with it later.
  4. It is compatible with the EUPL 1.2 license
  5. I have squashed any insignificant commits. (git rebase)

  • I have read the above and my PR is ready for review. Check this box to confirm

@yubiuser
Copy link
Member

yubiuser commented Aug 6, 2024

@PromoFaux
Copy link
Member Author

FP'd

Signed-off-by: Adam Warner <[email protected]>
@PromoFaux
Copy link
Member Author

Perhaps not as simple as that... one to investigate

@rdwebdesign
Copy link
Member

rdwebdesign commented Aug 6, 2024

I tried to build and test locally and I'm receiving this error:

33.54       creating build/temp.linux-armv7l-cpython-312/aiohttp
33.54       gcc -fno-strict-overflow -Wsign-compare -DNDEBUG -g -O3 -Wall -fPIC -I/usr/include/python3.12 -c aiohttp/_websocket.c -o build/temp.linux-armv7l-cpython-312/aiohttp/_websocket.o
33.54       error: command 'gcc' failed: No such file or directory
33.54       [end of output]
33.54
33.54   note: This error originates from a subprocess, and is likely not a problem with pip.
33.54   ERROR: Failed building wheel for aiohttp
33.55 Successfully built pytest-clarity
33.55 Failed to build aiohttp
33.95 ERROR: ERROR: Failed to build installable wheels for some pyproject.toml based projects (aiohttp)

Signed-off-by: yubiuser <[email protected]>
@yubiuser
Copy link
Member

yubiuser commented Aug 7, 2024

Another approach would be to remove the sed and the same monkeypatch as used in core

https://github.com/pi-hole/pi-hole/blob/be5a8dc51a7b3e7ec3b40a9c815dee1c866ea2d4/test/conftest.py#L21-L35

@yubiuser
Copy link
Member

yubiuser commented Aug 9, 2024

@PromoFaux

See my commit and last comment. Which way do you prefer?

@PromoFaux
Copy link
Member Author

Ah, Sorry - didn't see that you'd pushed a commit before your comment.

If I've understood it correctly, I think the monkeypatch is probably more resiliant as it is one less thing to have to update every time the python version updates?

@yubiuser
Copy link
Member

yubiuser commented Aug 9, 2024

I think I found a nice solution. My concern with the monkeypatch is that it is way harder to understand than a small sed command

@PromoFaux
Copy link
Member Author

Ah yeah, that's good!

@PromoFaux PromoFaux merged commit 1c7d276 into development-v6 Aug 9, 2024
7 checks passed
@PromoFaux PromoFaux deleted the update-alpine branch August 9, 2024 13:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants