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.

Sign up for GitHub

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

Jump to bottom

Enable 24.04 CI, remove distutils dependency #1408

Merged
merged 4 commits into from
May 7, 2024
Merged

Enable 24.04 CI, remove distutils dependency #1408

merged 4 commits into from
May 7, 2024
+13 −21

Conversation

scpeters
Copy link
Member

@scpeters scpeters commented May 6, 2024

🎉 New feature

Attempting to enable CI on 24.04

Summary

The python3-distutils package is not available on 24.04, but we only use it in a codepath for old versions of cmake. Since we are already requiring cmake 3.22.1 in gz-cmake4, we can require that version in sdformat15 as well and remove code for old versions of cmake.

Test it

Observe CI results

Checklist

  • Signed all commits for DCO
  • Added tests
  • Added example and/or tutorial
  • Updated documentation (as needed)
  • Updated migration guide (as needed)
  • Consider updating Python bindings (if the library has them)
  • codecheck passed (See contributing)
  • All tests passed (See test coverage)
  • While waiting for a review on your PR, please help review another open pull request to support the maintainers

Note to maintainers: Remember to use Squash-Merge and edit the commit message to match the pull request summary while retaining Signed-off-by messages.

scpeters added 4 commits May 6, 2024 16:52
@scpeters
Don't use python3-distutils any longer
66ac313 
distutils is not required since this branch requires a
new enough version of cmake.

Signed-off-by: Steve Peters <[email protected]>
@scpeters
Enable 24.04 CI
25bf69f 
Signed-off-by: Steve Peters <[email protected]>
@scpeters
Remove outdated cmake code
7644521 
Setting python debug libraries is not needed as of
cmake 3.12.

Signed-off-by: Steve Peters <[email protected]>
@scpeters
Require cmake 3.22.1
480acda 
Signed-off-by: Steve Peters <[email protected]>
@github-actions github-actions bot added the 🏛️ ionic Gazebo Ionic label May 6, 2024
@scpeters scpeters marked this pull request as ready for review May 6, 2024 18:14
@scpeters scpeters requested a review from azeey as a code owner May 6, 2024 18:14
@scpeters scpeters merged commit 342e842 into main May 7, 2024
10 checks passed
@scpeters scpeters deleted the scpeters/noble_ci branch May 7, 2024 07:59
@Blast545
Copy link
Contributor

🧑‍🌾 @scpeters Can this one be backported to sdf14? I think it should fix CI on Harmonic+Noble, see:
https://build.osrfoundation.org/job/sdformat-ci-sdf14-noble-amd64/4/console

I am not sure if the cmake bump can be done there too.

@scpeters
Copy link
Member Author

🧑‍🌾 @scpeters Can this one be backported to sdf14? I think it should fix CI on Harmonic+Noble, see: https://build.osrfoundation.org/job/sdformat-ci-sdf14-noble-amd64/4/console

I am not sure if the cmake bump can be done there too.

I would not backport the change in minimum required cmake version to sdf14, but the other changes can be back ported

@scpeters
Copy link
Member Author

🧑‍🌾 @scpeters Can this one be backported to sdf14? I think it should fix CI on Harmonic+Noble, see: https://build.osrfoundation.org/job/sdformat-ci-sdf14-noble-amd64/4/console
I am not sure if the cmake bump can be done there too.

I would not backport the change in minimum required cmake version to sdf14, but the other changes can be back ported

actually maybe we could backport the cmake 3.22.1 changes to sdf14? It already requires 22.04

@Blast545
Copy link
Contributor

@scpeters Will do, opening a PR now

scpeters added a commit that referenced this pull request May 13, 2024
@scpeters
Enable 24.04 CI, remove distutils dependency (#1408)
c351097 
* distutils is no longer required since this branch requires a
 new enough version of cmake.
* Remove outdated cmake code: setting python
  debug libraries is not needed as of cmake 3.12.
* Require cmake 3.22.1

Signed-off-by: Steve Peters <[email protected]>
Blast545 pushed a commit that referenced this pull request May 13, 2024
@scpeters @Blast545
Enable 24.04 CI, remove distutils dependency (#1408)
e100e03 
* distutils is no longer required since this branch requires a
 new enough version of cmake.
* Remove outdated cmake code: setting python
  debug libraries is not needed as of cmake 3.12.
* Require cmake 3.22.1

Signed-off-by: Steve Peters <[email protected]>
scpeters added a commit that referenced this pull request May 14, 2024
@Blast545 @scpeters
(Backport) Enable 24.04 CI, remove distutils dependency (#1413)
321d85e 
* Enable 24.04 CI, remove distutils dependency (#1408)
  distutils is no longer required since this branch requires a
 new enough version of cmake.

Signed-off-by: Steve Peters <[email protected]>
Signed-off-by: Jorge Perez <[email protected]>
Co-authored-by: Steve Peters <[email protected]>
@scpeters scpeters mentioned this pull request May 24, 2024
Closed
29 tasks
aagrawal05 pushed a commit to aagrawal05/sdformat that referenced this pull request Aug 16, 2024
@Blast545 @scpeters
(Backport) Enable 24.04 CI, remove distutils dependency (gazebosim#1413)
24a58ca 
* Enable 24.04 CI, remove distutils dependency (gazebosim#1408)
  distutils is no longer required since this branch requires a
 new enough version of cmake.

Signed-off-by: Steve Peters <[email protected]>
Signed-off-by: Jorge Perez <[email protected]>
Co-authored-by: Steve Peters <[email protected]>
aagrawal05 pushed a commit to aagrawal05/sdformat that referenced this pull request Aug 16, 2024
@Blast545 @scpeters @aagrawal05
(Backport) Enable 24.04 CI, remove distutils dependency (gazebosim#1413)
74aca7e 
* Enable 24.04 CI, remove distutils dependency (gazebosim#1408)
  distutils is no longer required since this branch requires a
 new enough version of cmake.

Signed-off-by: Steve Peters <[email protected]>
Signed-off-by: Jorge Perez <[email protected]>
Co-authored-by: Steve Peters <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@azeey azeey azeey approved these changes

@iche033 iche033 iche033 approved these changes

Assignees
No one assigned
Labels
🏛️ ionic Gazebo Ionic
Projects
Core development
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@scpeters @Blast545 @azeey @iche033