Merge master into develop #6649
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
Fixes to run test_suite.yml during macos CI (if "test suite mac" label is present). * Make sure the Contents/Frameworks folder is created. * Set WEBOTS_HOME_PATH such that tests can find Makefile.include during CI. * Change WEBOTS_HOME to Webots.app and add logic to test_suite.py to find webots executable. * Get qt_warning_filters.conf from correct location on macos. * Ignore (but warn about) error trying to connect to background Webots on MacOS. * On Mac, timeout test after 60 minutes instead of 10. * Use macos-13 runner instead of macos-14. The former has twice as much RAM as the latter. * Install urdfdom during macos CI because it is needed by tests suite. * Assert that move succeeds. * Print age of ode_tmp.dif so we can see how long we should wait on macos during CI. * Allow up to 20 seconds for world reload. * Skip billboard.wbt test during macos CI. The test passes locally, so the failure is presumably due to the CI server being headless. * Only increase timeout on macos. --------- Co-authored-by: CoolSpy3 <[email protected]> Co-authored-by: Olivier Michel <[email protected]>
omichel
approved these changes
Sep 1, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Synchronizes changes of master branch into develop branch.