diff --git a/docker/Dockerfile b/docker/Dockerfile index 878d8215f..04998378a 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -8,7 +8,7 @@ ARG DOCKERUSER= ARG DOCKERUSERCOMMENT= ARG ROS_DISTRO=jazzy ARG ROS_TESTING=0 -ARG WEBOTS_VERSION=2023b +ARG WEBOTS_VERSION=2025a RUN if [ "${ROS_DISTRO}" != "humble" ]; then userdel -r ubuntu; fi RUN useradd -d /${DOCKERUSER} -m \ @@ -20,7 +20,7 @@ RUN useradd -d /${DOCKERUSER} -m \ usermod -a -G dialout ${DOCKERUSER} RUN apt update && apt install -y wget && \ - wget https://github.com/cyberbotics/webots/releases/download/R${WEBOTS_VERSION}/webots_${WEBOTS_VERSION}_amd64.deb -O /tmp/webots.deb && \ + wget https://github.com/cyberbotics/webots/releases/download/nightly_25_12_2024/webots_2025a_amd64.deb -O /tmp/webots.deb && \ apt install -y /tmp/webots.deb && \ rm /tmp/webots.deb diff --git a/docker/Makefile b/docker/Makefile index 3114b56c5..d8df5de5b 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -6,7 +6,7 @@ BASENAME:=webots_ros2 DOCKERUSERCOMMENT:="Cyberbotics" ROS_DISTRO?=jazzy ROS_TESTING?=0 -WEBOTS_VERSION?=2023b +WEBOTS_VERSION?=2025a build: echo "ROS_TESTING=${ROS_TESTING}" diff --git a/docker/README.md b/docker/README.md index 5a7bd67df..80d6697b0 100644 --- a/docker/README.md +++ b/docker/README.md @@ -13,7 +13,7 @@ curl -sSL https://get.docker.com | sh && sudo usermod -aG docker $USER You need to build & run the container only the first time: ```bash -ROS_DISTRO=jazzy ROS_TESTING=1 WEBOTS_VERSION=2023b make build run exec +ROS_DISTRO=jazzy ROS_TESTING=0 WEBOTS_VERSION=2025a make build run exec ``` After that, you can just attach to the container with: diff --git a/scripts/ci_before_init_embed.bash b/scripts/ci_before_init_embed.bash index 4074e52cf..a18a66057 100755 --- a/scripts/ci_before_init_embed.bash +++ b/scripts/ci_before_init_embed.bash @@ -3,7 +3,7 @@ ROS_DISTRO=$1 export TEST_WITH_WEBOTS_NIGTHLY=0 -export WEBOTS_RELEASE_VERSION=2024a +export WEBOTS_RELEASE_VERSION=2025a export WEBOTS_OFFSCREEN=1 export CI=1 export DEBIAN_FRONTEND=noninteractive diff --git a/webots_ros2_driver/webots_ros2_driver/utils.py b/webots_ros2_driver/webots_ros2_driver/utils.py index 1b8f2e439..db7e2b6aa 100644 --- a/webots_ros2_driver/webots_ros2_driver/utils.py +++ b/webots_ros2_driver/webots_ros2_driver/utils.py @@ -27,7 +27,7 @@ # The minimal version should be the last stable release of Webots (both on master and develop branches) -MINIMUM_VERSION_STR = 'R2023b' +MINIMUM_VERSION_STR = 'R2025a' @functools.total_ordering