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

Fix-test-suite-not-run-on-macos #6631

Merged
merged 46 commits into from
Aug 31, 2024
Merged

Fix-test-suite-not-run-on-macos #6631

merged 46 commits into from
Aug 31, 2024

Commits on Aug 15, 2024

  1. Bump the Qt version from 6.4.3 to 6.5.3. 

    6.4.3 is no longer supported, while 6.5.3 is the latest LTS release and is supported through 31 Mar 2026.

For this to work, the precompiled binaries at https://cyberbotics.com/files/repository/dependencies/ will need to be updated but I don't think I have the ability to do that.
    @brettle
    brettle committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    83dee1f View commit details
    Browse the repository at this point in the history

  2. Add changelog entry.

    @brettle
    brettle committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    473ce86 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into fix-to-use-supported-qt-version

    @brettle
    brettle committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    068d715 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2024

  1. Get Qt from system on ubuntu 22.04 and via aqtinstall on Ubuntu 20.04.

    @brettle
    brettle committed Aug 17, 2024
    Configuration menu
    Copy the full SHA
    8293c4c View commit details
    Browse the repository at this point in the history

  2. Move package installation to linux_compilation_dependencies.sh and li… 

    …nux_runtime_dependencies.sh.
    @brettle
    brettle committed Aug 17, 2024
    Configuration menu
    Copy the full SHA
    bc574a2 View commit details
    Browse the repository at this point in the history

  3. Fix package name for Qt WebSockets on Ubuntu 22.04.

    @brettle
    brettle committed Aug 17, 2024
    Configuration menu
    Copy the full SHA
    6de0828 View commit details
    Browse the repository at this point in the history

  4. Temporarily move Mac back to Qt 6.4.3 in hopes of getting the test su… 

    …ite to run with the new linux builds.
    @brettle
    brettle committed Aug 17, 2024
    Configuration menu
    Copy the full SHA
    b192745 View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2024

  1. Temporarily allow access for debugging.

    @brettle
    brettle committed Aug 18, 2024
    Configuration menu
    Copy the full SHA
    ef65c5d View commit details
    Browse the repository at this point in the history

  2. Use aqt for all linux because Ubuntu 22.04 only has Qt 6.2 and we nee… 

    …d at least 6.4.3.
    @brettle
    brettle committed Aug 18, 2024
    Configuration menu
    Copy the full SHA
    79b6b62 View commit details
    Browse the repository at this point in the history

  3. Add back libxcb-cursor0.

    @brettle
    brettle committed Aug 18, 2024
    Configuration menu
    Copy the full SHA
    bd9f821 View commit details
    Browse the repository at this point in the history

  4. Add openssl as a runtime dep.

    @brettle
    brettle committed Aug 18, 2024
    Configuration menu
    Copy the full SHA
    19287c6 View commit details
    Browse the repository at this point in the history

  5. Copy system openssl3 libs on Ubuntu 22.04 and use built libs on Ubunt… 

    …u 20.04.

Building libs is still TODO.
    @brettle
    brettle committed Aug 18, 2024
    Configuration menu
    Copy the full SHA
    f7a8341 View commit details
    Browse the repository at this point in the history

  6. Build openssl3 from source on Ubuntu 20.04.

    @brettle
    brettle committed Aug 18, 2024
    Configuration menu
    Copy the full SHA
    67e9f26 View commit details
    Browse the repository at this point in the history

  7. Get rid of unneeded and unrecognized pushd in Makefile.linux.

    @brettle
    brettle committed Aug 18, 2024
    Configuration menu
    Copy the full SHA
    e672407 View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2024

  1. Use aqt to install Qt 6.5.3 for mac.

    @brettle
    brettle committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    87fa748 View commit details
    Browse the repository at this point in the history

  2. Allow login to mac if build fails.

    @brettle
    brettle committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    8a49ced View commit details
    Browse the repository at this point in the history

  3. Make sure the Contents/Frameworks folder is created.

    @brettle
    brettle committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    eac55f7 View commit details
    Browse the repository at this point in the history

  4. Remove upterm steps that were added for debugging.

    @brettle
    brettle committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    3d313b6 View commit details
    Browse the repository at this point in the history

  5. Make openssl just a compilation dependency for Ubuntu 22.04 because w… 

    …e bundle the libs with webots.
    @brettle
    brettle committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    37c0f00 View commit details
    Browse the repository at this point in the history

  6. Try to run the test suite during macos CI.

    @brettle
    brettle committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    71d6a43 View commit details
    Browse the repository at this point in the history

  7. Set WEBOTS_HOME_PATH such that tests can find Makefile.include during… 

    … CI.
    @brettle
    brettle committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    f1d55d3 View commit details
    Browse the repository at this point in the history

  8. Allow login for debugging.

    @brettle
    brettle committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    f4bbf59 View commit details
    Browse the repository at this point in the history

  9. Change WEBOTS_HOME to Webots.app and add logic to test_suite.py to fi… 

    …nd webots executable.
    @brettle
    brettle committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    a0ab607 View commit details
    Browse the repository at this point in the history

  10. Get qt_warning_filters.conf from correct location on macos.

    @brettle
    brettle committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    86873a1 View commit details
    Browse the repository at this point in the history

  11. Remove accidentally added checkout step.

    @brettle
    brettle committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    9417594 View commit details
    Browse the repository at this point in the history

  12. Hopefully squash clang-format complaint.

    @brettle
    brettle committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    d95696e View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2024

  1. Ignore (but warn about) error trying to connect to background Webots … 

    …on MacOS.
    @brettle
    brettle committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    70f7d7b View commit details
    Browse the repository at this point in the history

  2. Fix formatting.

    @brettle
    brettle committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    be29ef1 View commit details
    Browse the repository at this point in the history

  3. On Mac, timeout test after 60 minutes instead of 10.

    @brettle
    brettle committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    9488367 View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2024

  1. Merge branch 'master' into fix-test-suite-not-run-on-macos

    @brettle
    brettle committed Aug 25, 2024
    Configuration menu
    Copy the full SHA
    f099a99 View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2024

  1. Try single threaded build on macos CI.

    @brettle
    brettle committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    4954b9c View commit details
    Browse the repository at this point in the history

  2. Try using macos-13 runner instead of macos-14. The former has twice a… 

    …s much RAM as the latter.
    @brettle
    brettle committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    554a9cb View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2024

  1. Merge branch 'master' into fix-test-suite-not-run-on-macos

    @brettle
    brettle committed Aug 27, 2024
    Configuration menu
    Copy the full SHA
    60f7682 View commit details
    Browse the repository at this point in the history

  2. Install urdfdom during macos CI because it is needed by tests suite.

    @brettle
    brettle committed Aug 27, 2024
    Configuration menu
    Copy the full SHA
    4a1c4da View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into fix-test-suite-not-run-on-macos

    @brettle
    brettle committed Aug 27, 2024
    Configuration menu
    Copy the full SHA
    5e26dbd View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2024

  1. Assert that move succeeds.

    @brettle
    brettle committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    c0c2150 View commit details
    Browse the repository at this point in the history

  2. Print age of ode_tmp.dif so we can see how long we should wait on mac… 

    …os during CI.
    @brettle
    brettle committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    b51cef0 View commit details
    Browse the repository at this point in the history

  3. Allow up to 20 seconds for world reload.

    @brettle
    brettle committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    892614a View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2024

  1. Try waiting longer before timing out.

    @brettle
    brettle committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    9d850f8 View commit details
    Browse the repository at this point in the history

  2. Skip billboard.wbt test during macos CI. 

    The test passes locally, so the failure is presumably due to the CI server being headless.
    @brettle
    brettle committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    ee341c4 View commit details
    Browse the repository at this point in the history

  3. Restore multithreaded build.

    @brettle
    brettle committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    418c422 View commit details
    Browse the repository at this point in the history

  4. Remove unneeded comment.

    @brettle
    brettle committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    553c537 View commit details
    Browse the repository at this point in the history

  5. Remove upterm.

    @brettle
    brettle committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    b301158 View commit details
    Browse the repository at this point in the history

  6. Only increase timeout on macos. 

    Co-authored-by: CoolSpy3 <55305038+CoolSpy3@users.noreply.github.com>
    @brettle @CoolSpy3
    brettle and CoolSpy3 committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    1468e14 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2024

  1. Simplify some syntax. 

    Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>
    @brettle @omichel
    brettle and omichel committed Aug 30, 2024
    Configuration menu
    Copy the full SHA
    6fbe675 View commit details
    Browse the repository at this point in the history

  2. Only run the test suite if the "test suite mac" label is present.

    @brettle
    brettle committed Aug 30, 2024
    Configuration menu
    Copy the full SHA
    60fdb16 View commit details
    Browse the repository at this point in the history