Skip to content

Commit ac8a683

Browse files
CoolSpy3CoolSpy3
authored
Update MacOS Runner (cyberbotics#6580)
1 parent a01ffad commit ac8a683

505 files changed

Lines changed: 1317 additions & 1256 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/test_suite_mac.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
if: ${{ contains(github.event.pull_request.labels.*.name, 'test webots build') }}
2020
strategy:
2121
matrix:
22-
os: [macos-11]
22+
os: [macos-14]
2323
runs-on: ${{ matrix.os }}
2424
steps:
2525
- uses: actions/checkout@v3
@@ -33,7 +33,7 @@ jobs:
3333
if: ${{ github.event_name == 'push' || github.event_name == 'schedule' || contains(github.event.pull_request.labels.*.name, 'test distribution') || contains(github.event.pull_request.labels.*.name, 'test suite') }}
3434
strategy:
3535
matrix:
36-
os: [macos-11]
36+
os: [macos-14]
3737
runs-on: ${{ matrix.os }}
3838
steps:
3939
- uses: actions/checkout@v3
@@ -69,7 +69,7 @@ jobs:
6969
if: ${{ contains(github.event.pull_request.labels.*.name, 'test suite') }}
7070
strategy:
7171
matrix:
72-
os: [macos-11]
72+
os: [macos-14]
7373
runs-on: ${{ matrix.os }}
7474
steps:
7575
- uses: actions/checkout@v3
@@ -98,7 +98,7 @@ jobs:
9898
if: ${{ always() && !contains(github.event.pull_request.labels.*.name, 'test distribution') && !contains(github.event.pull_request.labels.*.name, 'test webots build') }}
9999
strategy:
100100
matrix:
101-
os: [macos-11]
101+
os: [macos-14]
102102
runs-on: ubuntu-latest
103103
steps:
104104
- name: Delete artifacts

‎.github/workflows/test_suite_mac_develop.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
if: ${{ contains(github.event.pull_request.labels.*.name, 'test webots build') }}
1414
strategy:
1515
matrix:
16-
os: [macos-11]
16+
os: [macos-14]
1717
runs-on: ${{ matrix.os }}
1818
steps:
1919
- uses: actions/checkout@v3
@@ -28,7 +28,7 @@ jobs:
2828
if: ${{ github.event_name == 'push' || github.event_name == 'schedule' || contains(github.event.pull_request.labels.*.name, 'test distribution') || contains(github.event.pull_request.labels.*.name, 'test suite') }}
2929
strategy:
3030
matrix:
31-
os: [macos-11]
31+
os: [macos-14]
3232
runs-on: ${{ matrix.os }}
3333
steps:
3434
- uses: actions/checkout@v3
@@ -65,7 +65,7 @@ jobs:
6565
if: ${{ contains(github.event.pull_request.labels.*.name, 'test suite') }}
6666
strategy:
6767
matrix:
68-
os: [macos-11]
68+
os: [macos-14]
6969
runs-on: ${{ matrix.os }}
7070
steps:
7171
- uses: actions/checkout@v3
@@ -96,7 +96,7 @@ jobs:
9696
if: ${{ always() && !contains(github.event.pull_request.labels.*.name, 'test distribution') && !contains(github.event.pull_request.labels.*.name, 'test webots build') }}
9797
strategy:
9898
matrix:
99-
os: [macos-11]
99+
os: [macos-14]
100100
runs-on: ubuntu-latest
101101
steps:
102102
- name: Delete artifacts

‎.github/workflows/tests_sources.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@ jobs:
3434
strategy:
3535
fail-fast: false
3636
matrix:
37-
os: [ubuntu-22.04, macos-11, windows-2019]
37+
os: [ubuntu-22.04, macos-14, windows-2019]
3838
python: [3.9]
3939
include:
4040
- os: ubuntu-22.04
41-
DEPENDENCIES_INSTALLATION: "wget https://github.com/danmar/cppcheck/archive/refs/tags/2.10.tar.gz; tar -xf 2.10.tar.gz -C ~/; mkdir -p ~/cppcheck-2.10/build; cd ~/cppcheck-2.10/build; cmake ..; cmake --build .; export PATH=~/cppcheck-2.10/build/bin:$PATH"
42-
- os: macos-11
43-
DEPENDENCIES_INSTALLATION: "brew tap-new --no-git $USER/local-cppcheck; brew extract --version=2.10 cppcheck $USER/local-cppcheck; brew install cppcheck@2.10; brew tap-new --no-git $USER/local-clang-format; brew extract --version=14.0.0 clang-format $USER/local-clang-format; brew install clang-format@14.0.0"
41+
DEPENDENCIES_INSTALLATION: "wget https://github.com/danmar/cppcheck/archive/refs/tags/2.14.2.tar.gz; tar -xf 2.14.2.tar.gz -C ~/; mkdir -p ~/cppcheck-2.14.2/build; cd ~/cppcheck-2.14.2/build; cmake ..; cmake --build .; export PATH=~/cppcheck-2.14.2/build/bin:$PATH"
42+
- os: macos-14
43+
DEPENDENCIES_INSTALLATION: "brew tap-new --no-git $USER/local-cppcheck; brew extract --version=2.14.2 cppcheck $USER/local-cppcheck; brew install cppcheck@2.14.2; brew tap-new --no-git $USER/local-clang-format; brew extract --version=14.0.0 clang-format $USER/local-clang-format; brew install clang-format@14.0.0"
4444
- os: windows-2019
45-
DEPENDENCIES_INSTALLATION: "choco install -y cppcheck --version=2.10 || true; choco uninstall -y llvm; choco install -y llvm --version=14.0.0; export PATH=$PATH:\"/c/Program Files/Cppcheck:/c/Program Files/LLVM/bin\""
45+
DEPENDENCIES_INSTALLATION: "curl -LJO https://github.com/danmar/cppcheck/releases/download/2.14.1/cppcheck-2.14.1-x64-Setup.msi; powershell 'Start-Process msiexec -ArgumentList \"/quiet\",\"/passive\",\"/qn\",\"/i\",\"cppcheck-2.14.1-x64-Setup.msi\" -Wait'; choco uninstall -y llvm; choco install -y llvm --version=14.0.0; export PATH=$PATH:\"/c/Program Files/Cppcheck:/c/Program Files/LLVM/bin\""
4646
runs-on: ${{ matrix.os }}
4747
if: needs.job-skipper.outputs.should_skip != 'true'
4848
steps:

‎.github/workflows/tests_sources_with_latest_cppcheck.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ jobs:
3030
strategy:
3131
fail-fast: false
3232
matrix:
33-
os: [ubuntu-22.04, macos-11, windows-2019]
33+
os: [ubuntu-22.04, macos-14, windows-2019]
3434
python: [3.9]
3535
include:
3636
- os: ubuntu-22.04
3737
DEPENDENCIES_INSTALLATION: "sudo apt -y install cppcheck"
38-
- os: macos-11
38+
- os: macos-14
3939
DEPENDENCIES_INSTALLATION: "brew install cppcheck; brew tap-new --no-git $USER/local-clang-format; brew extract --version=14.0.0 clang-format $USER/local-clang-format; brew install clang-format@14.0.0"
4040
- os: windows-2019
4141
DEPENDENCIES_INSTALLATION: "choco install -y cppcheck || true; choco uninstall -y llvm; choco install -y llvm --version=14.0.0; export PATH=$PATH:\"/c/Program Files/Cppcheck:/c/Program Files/LLVM/bin\""

‎docs/guide/system-requirements.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ We recommend using a recent version of Linux.
1919
Webots is provided for Linux 64 (x86-64) systems only.
2020
Webots doesn't run on Ubuntu versions earlier than 20.04.
2121
- Windows: Webots runs on Windows 11 and Windows 10 (64-bit versions only).
22-
- Mac: Webots runs on macOS 11 "Big Sur", macOS 12 "Monterey" and macOS 13 "Ventura".
22+
- Mac: Webots runs on macOS macOS 12 "Monterey", macOS 13 "Ventura", and macOS 14 "Sonoma".
2323

2424
Webots may work but is not officially supported on earlier versions of the above mentioned operating systems.
2525

‎docs/reference/changelog-r2024.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@
44
Released on December **th, 2023.
55
- New Features
66
- **Change the name of the web scene format from `X3D` to `W3D` ([#6280](https://github.com/cyberbotics/webots/pull/6280)).**
7+
- Removed support for macOS 11 "Big Sur" and added support for macOS 14 "Sonoma" ([#6580](https://github.com/cyberbotics/webots/pull/6580)).
78
- Enhancements
89
- Improved the image range of the rotating [Lidar](lidar.md) ([#6324](https://github.com/cyberbotics/webots/pull/6324)).
910
- Cleanup
1011
- Removed deprecated `windowPosition`, `pixelSize` fields of [Display](display.md) node ([#6327](https://github.com/cyberbotics/webots/pull/6327)).
1112
- Bug Fixes
1213
- Fixed error message on Windows when `libssl-3-x64.dll` was added to `PATH` ([#6553](https://github.com/cyberbotics/webots/pull/6553)).
1314
- Fixed length of arrays returned by `getPose()` in Java ([#6556](https://github.com/cyberbotics/webots/pull/6556)).
14-
- Fixed length of arrays returned by `CameraRecognitionObject.getColors()` in Java ([#6564](https://github.com/cyberbotics/webots/pull/6564))
15-
- Fixed handling of device objects with the same name in the controller API ([#6579](https://github.com/cyberbotics/webots/pull/6579))
15+
- Fixed length of arrays returned by `CameraRecognitionObject.getColors()` in Java ([#6564](https://github.com/cyberbotics/webots/pull/6564)).
16+
- Fixed handling of device objects with the same name in the controller API ([#6579](https://github.com/cyberbotics/webots/pull/6579)).

‎include/controller/c/webots/plugins/robot_window/generic_robot_window/generic.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ extern "C" {
2929
#endif
3030

3131
void wbu_generic_robot_window_parse_device_command(char *token, char *tokens);
32-
bool wbu_generic_robot_window_parse_device_control_command(char *first_token, char *tokens);
32+
bool wbu_generic_robot_window_parse_device_control_command(const char *first_token, char *tokens);
3333
bool wbu_generic_robot_window_handle_messages(const char *message);
3434
void wbu_generic_robot_window_init();
3535
void wbu_generic_robot_window_update();

‎include/controller/c/webots/utils/string.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ extern "C" {
2626
#endif
2727

2828
char *wbu_string_strsep(char **stringp, const char *delim);
29-
char *wbu_string_replace(char *value, char *before, char *after);
29+
char *wbu_string_replace(char *value, const char *before, const char *after);
3030

3131
#ifdef __cplusplus
3232
}

‎include/wren/drawable_texture.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ typedef struct WrFont WrFont;
1515
WrDrawableTexture *wr_drawable_texture_new();
1616

1717
void wr_drawable_texture_set_font(WrDrawableTexture *texture, WrFont *font);
18-
void wr_drawable_texture_set_color(WrDrawableTexture *texture, float *color);
18+
void wr_drawable_texture_set_color(WrDrawableTexture *texture, const float *color);
1919
void wr_drawable_texture_set_antialasing(WrDrawableTexture *texture, bool enabled);
2020
void wr_drawable_texture_set_use_premultiplied_alpha(WrDrawableTexture *texture, bool premultipliedAlpha);
2121

‎projects/default/controllers/ros/RosSensor.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
#include "RosSensor.hpp"
1616

17-
RosSensor::RosSensor(std::string deviceName, Device *device, Ros *ros, bool enableDefaultServices) :
17+
RosSensor::RosSensor(const std::string &deviceName, Device *device, Ros *ros, bool enableDefaultServices) :
1818
RosDevice(device, ros, enableDefaultServices),
1919
mFrameIdPrefix("") {
2020
std::string fixedDeviceName = Ros::fixedNameString(deviceName);

0 commit comments

Comments
 (0)