-
-
Notifications
You must be signed in to change notification settings - Fork 1.7k
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
Remove Ubuntu 20.04 and add 24.04 support #6704
base: develop
Are you sure you want to change the base?
Conversation
…tch "test_suit_linux", Remove Ubuntu 20.04 Packaging From "linux_distro.py"
@@ -111,6 +114,7 @@ private void displayHelp(){ | |||
|
|||
public static void main(String[] args) { | |||
Driver controller = new Driver(); | |||
controller.initialize(); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is needed to avoid the "this-escape" warning on Java 21:
https://stackoverflow.com/questions/77191858/what-is-a-this-escape-warning-and-how-do-i-deal-with-it
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In general it looks good, there is one issue I noticed.
Please also check once more the following PR as a reference:
#4502
tests/test_suite.py
Outdated
@@ -206,8 +209,8 @@ def generateWorldsList(groupName): | |||
not ('GITHUB_ACTIONS' in os.environ and ( | |||
filename.endswith('speaker.wbt') or | |||
filename.endswith('local_proto_with_texture.wbt') or | |||
(filename.endswith('robot_window_html.wbt') and is_ubuntu_22_04) or | |||
(filename.endswith('supervisor_start_stop_movie.wbt') and is_ubuntu_22_04) or | |||
(filename.endswith('robot_window_html.wbt') and (is_ubuntu_22_04 or is_ubuntu_24_04)) or |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This added condition means supervisor_start_stop_movie.wbt
and robot_window_html.wbt
will not be tested at all on Linux. We should check if we can test it at least for one version of Ubuntu
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, you are right, sorry for the oversight. I reverted the changes, so the test "test suite" only performs on Ubuntu 22.04. It passes the test as expected.
USR_LIB_X68_64_24_04 = [ | ||
"libIex-3_1.so.30", | ||
"libIlmThread-3_1.so.30", | ||
"libwebp.so.7", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Here we are missing some libraries. We discussed them, but just leaving a note
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I believe these libraries are related to the tar distribution. It would be good to test the tar distribution on a clean Ubuntu 24.04
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good, thank you
Description
This pull-request focuses on removing support for Ubuntu 20.04 and adding support for Ubuntu 24.04. This involves updating dependencies, testing compatibility, and ensuring smooth packaging for the newer distribution.
Tasks
Add the list of tasks of this PR.
Additional context
This update transitions Webots to the latest supported LTS versions of Ubuntu. While dropping 20.04, the focus is on enhancing compatibility and functionality for users adopting Ubuntu 24.04. This ensures alignment with modern software ecosystems and provides access to newer libraries and features.
The packages: "libHalf-2_5.so.25", "libIexMath-2_5.so.25" and "libIlmImf-2_5.so.25" are missing on Ubuntu 24.04 but the tests are passing.
webots/scripts/packaging/linux_distro.py
Lines 51 to 55 in d5402db