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

chore: merge 3.5 into 3.6 #82

Merged
merged 11 commits into from
Nov 10, 2024
Merged

chore: merge 3.5 into 3.6 #82

merged 11 commits into from
Nov 10, 2024

Conversation

manadart
Copy link
Member

@manadart manadart commented Nov 8, 2024

Merge from 3.5 to bring forward build support for running on 24.04.

A correction to the list of architectures is slipstreamed in.

manadart and others added 9 commits June 7, 2024 12:16
feat: add 24.04 as a supported Ubuntu base
chore: merge 3.4 into 3.5
This required in order to build the binary wheel(s) required by the
included COS libs.
fix: add Cargo as a build dependency
This required in order to build the binary wheel(s) required by the
included COS libs.
Version 3 of charmcraft does not allow a run-on stanza that includes
24.04 with other versions, but 2 does. So we install this versions for
   our Github workflows.
fix: add Cargo as a build dependency to charmcraft.yaml
@hpidcock
Copy link
Member

hpidcock commented Nov 8, 2024

I am concerned about pydantic_core not being built for all architectures. We might need to handle that somehow.

find . | xargs file | grep x86
./venv/pip/_vendor/distlib/t64.exe:                                                                PE32+ executable (console) x86-64, for MS Windows, 6 sections
./venv/pip/_vendor/distlib/w64.exe:                                                                PE32+ executable (GUI) x86-64, for MS Windows, 6 sections
./venv/markupsafe/_speedups.cpython-310-x86_64-linux-gnu.so:                                       ELF 64-bit LSB shared object, x86-64, version 1 (SYSV), dynamically linked, BuildID[sha1]=faef76bf42679083de33263617529dd08a484df9, with debug_info, not stripped
./venv/pydantic_core/_pydantic_core.cpython-310-x86_64-linux-gnu.so:                               ELF 64-bit LSB shared object, x86-64, version 1 (SYSV), dynamically linked, BuildID[sha1]=bb3ad424f0ce6091db88c1077d93367b091bdc4e, stripped
./venv/setuptools/cli-64.exe:                                                             PE32+ executable (console) x86-64, for MS Windows, 4 sections
./venv/setuptools/gui-64.exe:                                                             PE32+ executable (GUI) x86-64, for MS Windows, 4 sections

@manadart
Copy link
Member Author

I am concerned about pydantic_core not being built for all architectures. We might need to handle that somehow.

Yeah, I think we might also have an issue with COS on non-AMD64. I will merge this and do some testing. A good thing for someone to test with an ARM machine, is relating COS-lite to a controller.

Testing on an old version was vestigial.
Not sure how we ended up with this list of architectures.
@manadart manadart merged commit 55add98 into 3.6 Nov 10, 2024
7 of 8 checks passed
@manadart manadart deleted the 3.5-into-3.6 branch November 10, 2024 18:59
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.

4 participants