Skip to content

Commit 62482fc

Browse files
authored
Merge branch 'main' into patch-3
2 parents e21c70f + 9479604 commit 62482fc

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

.github/workflows/docker.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
username: ${{ secrets.DOCKERHUB_USERNAME }}
5757
password: ${{ secrets.DOCKERHUB_TOKEN }}
5858
- name: Build and Push
59-
uses: docker/build-push-action@v5
59+
uses: docker/build-push-action@v6
6060
with:
6161
file: .docker/${{ github.job }}/Dockerfile
6262
build-args: ROS_DISTRO=${{ matrix.ROS_DISTRO }}
@@ -109,7 +109,7 @@ jobs:
109109
username: ${{ secrets.DOCKERHUB_USERNAME }}
110110
password: ${{ secrets.DOCKERHUB_TOKEN }}
111111
- name: Build and Push
112-
uses: docker/build-push-action@v5
112+
uses: docker/build-push-action@v6
113113
with:
114114
file: .docker/${{ github.job }}/Dockerfile
115115
build-args: ROS_DISTRO=${{ matrix.ROS_DISTRO }}
@@ -158,7 +158,7 @@ jobs:
158158
- name: "Remove .dockerignore"
159159
run: rm .dockerignore # enforce full source context
160160
- name: Build and Push
161-
uses: docker/build-push-action@v5
161+
uses: docker/build-push-action@v6
162162
with:
163163
context: .
164164
file: .docker/${{ github.job }}/Dockerfile

.github/workflows/tutorial_docker.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ jobs:
5151
path: .ccache
5252
key: docker-tutorial-ccache-${{ matrix.ROS_DISTRO }}-${{ hashFiles( '.docker/tutorial-source/Dockerfile' ) }}
5353
- name: inject ccache into docker
54-
uses: reproducible-containers/buildkit-cache-dance@v3.1.0
54+
uses: reproducible-containers/buildkit-cache-dance@v3.1.1
5555
with:
5656
cache-source: .ccache
5757
cache-target: /root/.ccache/
5858
- name: Build and Push
59-
uses: docker/build-push-action@v5
59+
uses: docker/build-push-action@v6
6060
with:
6161
context: .
6262
file: .docker/${{ github.job }}/Dockerfile

moveit_setup_assistant/moveit_setup_framework/src/srdf_config.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ bool SRDFConfig::GeneratedJointLimits::writeYaml(YAML::Emitter& emitter)
300300

301301
// Output property
302302
emitter << YAML::Key << "max_velocity";
303-
emitter << YAML::Value << std::min(fabs(b.max_velocity_), fabs(b.min_velocity_));
303+
emitter << YAML::Value << static_cast<double>(std::min(fabs(b.max_velocity_), fabs(b.min_velocity_)));
304304

305305
// Output property
306306
emitter << YAML::Key << "has_acceleration_limits";
@@ -315,7 +315,7 @@ bool SRDFConfig::GeneratedJointLimits::writeYaml(YAML::Emitter& emitter)
315315

316316
// Output property
317317
emitter << YAML::Key << "max_acceleration";
318-
emitter << YAML::Value << std::min(fabs(b.max_acceleration_), fabs(b.min_acceleration_));
318+
emitter << YAML::Value << static_cast<double>(std::min(fabs(b.max_acceleration_), fabs(b.min_acceleration_)));
319319

320320
emitter << YAML::EndMap;
321321
}

0 commit comments

Comments
 (0)