Skip to content

Commit 6e42887

Browse files
Merge branch 'main' into bugfix/normalize_quaternion
2 parents 00b0d46 + 7fd2e46 commit 6e42887

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ jobs:
3333
# https://stackoverflow.com/a/41673702
3434
CXXFLAGS: >-
3535
-Wall -Wextra -Wwrite-strings -Wunreachable-code -Wpointer-arith -Wredundant-decls -Wno-unknown-warning-option
36-
CLANG_TIDY_ARGS: --fix --fix-errors --format-style=file
3736
DOCKER_IMAGE: moveit/moveit2:${{ matrix.env.IMAGE }}
3837
UPSTREAM_WORKSPACE: >
3938
moveit2.repos
@@ -143,7 +142,7 @@ jobs:
143142
run: moveit_kinematics/test/test_ikfast_plugins.sh
144143
- id: ici
145144
name: Run industrial_ci
146-
uses: ros-industrial/industrial_ci@master
145+
uses: ros-industrial/industrial_ci@ba2a3d0f830f8051b356711a8df2fedfc5d256cf
147146
env: ${{ matrix.env }}
148147
# NOTE: Testspace is temporarily disabled and needs to be installed for the MoveIt org
149148
# See: https://github.com/moveit/moveit2/issues/2852

.github/workflows/tutorial_docker.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
- name: "Remove .dockerignore"
4747
run: rm .dockerignore # enforce full source context
4848
- name: Cache ccache
49-
uses: actions/cache@v4
49+
uses: actions/cache@v5
5050
with:
5151
path: .ccache
5252
key: docker-tutorial-ccache-${{ matrix.ROS_DISTRO }}-${{ hashFiles( '.docker/tutorial-source/Dockerfile' ) }}

0 commit comments

Comments
 (0)