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

Merge master into develop #6668

Merged
merged 3 commits into from
Sep 22, 2024
Merged

Merge master into develop #6668

merged 3 commits into from
Sep 22, 2024

Commits on Sep 21, 2024

  1. Ensure that test_suite.pt only tries to build controllers which have …

    …Makefiles. (#6666)
    
    Switching between master and develop branches can result in controller directories sticking around that only contain the results of a build on the previous branch. test_suite.py was trying (and failing) to run make in those directories.
    brettle committed Sep 21, 2024
    Configuration menu
    Copy the full SHA
    8977e52 View commit details
    Browse the repository at this point in the history
  2. Fix-references-to-raw-github-content (#6667)

    * Replace reference to raw github content with webots:// in ShapeWithFixedWebTexture.proto.
    
    The reference to a file in the github develop branch was causing that file to be left as changed when running test_suite.py in the develop branch.
    brettle committed Sep 21, 2024
    Configuration menu
    Copy the full SHA
    0a1f1eb View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2024

  1. Configuration menu
    Copy the full SHA
    f39bd26 View commit details
    Browse the repository at this point in the history