Skip to content

Commit 3af5678

Browse files
Merge branch 'master' into add/kilted
2 parents 89f334e + 7b0fef7 commit 3af5678

6 files changed

+15
-8
lines changed

.github/workflows/reusable-build-coverage.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
echo ~/.local/opt/node/bin >> $GITHUB_PATH
4242
4343
# overwrite ros distro with testing
44-
- uses: ros-tooling/[email protected].10
44+
- uses: ros-tooling/[email protected].11
4545
if: ${{ steps.prereq.outputs.need_ros2 == '1' }}
4646
with:
4747
use-ros2-testing: true
@@ -84,7 +84,7 @@ jobs:
8484
echo "No local repos file found"
8585
echo "repo_file=" >> $GITHUB_OUTPUT
8686
fi
87-
- uses: ros-tooling/[email protected].1
87+
- uses: ros-tooling/[email protected].2
8888
with:
8989
target-ros2-distro: ${{ inputs.ros_distro }}
9090
import-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/reusable-debian-build.yml

+7
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,13 @@ jobs:
6161
uses: ros-controls/ros2_control_ci/.github/actions/set-package-list@master
6262
with:
6363
path: ${{ env.path }}
64+
- name: Install dependencies
65+
shell: bash
66+
run: |
67+
apt-get update
68+
source /opt/ros2_ws/install/setup.bash
69+
rosdep update --rosdistro ${{ inputs.ros_distro }}
70+
rosdep install -iyr --from-path src || true # ignore errors, as some packages might not be available
6471
- name: Build workspace
6572
shell: bash
6673
run: |

.github/workflows/reusable-pre-commit.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
echo ~/.local/opt/node/bin >> $GITHUB_PATH
4040
4141
# needed only if a non-ros image is used
42-
- uses: ros-tooling/[email protected].10
42+
- uses: ros-tooling/[email protected].11
4343
if: ${{ steps.prereq.outputs.need_ros2 == '1' }}
4444
with:
4545
use-ros2-testing: true

.github/workflows/reusable-ros-tooling-source-build.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
echo ~/.local/opt/node/bin >> $GITHUB_PATH
5555
5656
# needed only if a non-ros image is used
57-
- uses: ros-tooling/[email protected].10
57+
- uses: ros-tooling/[email protected].11
5858
with:
5959
use-ros2-testing: true
6060
- uses: actions/checkout@v4
@@ -76,7 +76,7 @@ jobs:
7676
--deps-only --deps --upstream-development > /tmp/deps.repos && break || echo "retry #${i} .." && sleep 60;
7777
done
7878
79-
- uses: ros-tooling/[email protected].1
79+
- uses: ros-tooling/[email protected].2
8080
with:
8181
target-ros2-distro: ${{ inputs.ros_distro }}
8282
ref: ${{ inputs.ref }}

.github/workflows/reusable-ros-tooling-win-build.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
with:
5151
python-version: '3.8'
5252

53-
- uses: ros-tooling/[email protected].10
53+
- uses: ros-tooling/[email protected].11
5454
with:
5555
required-ros-distributions: ${{ inputs.ros_distro }}
5656
use-ros2-testing: true
@@ -110,7 +110,7 @@ jobs:
110110
"repo_file=" | Out-File -FilePath $Env:GITHUB_OUTPUT -Append
111111
}
112112
113-
- uses: ros-tooling/[email protected].1
113+
- uses: ros-tooling/[email protected].2
114114
# tests are disabled https://github.com/ros-tooling/action-ros-ci/pull/712#issuecomment-969495087
115115
env:
116116
BOOST_ROOT: ${{ steps.install-boost.outputs.BOOST_ROOT }}

.github/workflows/reusable-rosdoc2.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
echo ~/.local/opt/node/bin >> $GITHUB_PATH
3434
3535
# needed only if a non-ros image is used
36-
- uses: ros-tooling/[email protected].10
36+
- uses: ros-tooling/[email protected].11
3737
if: ${{ steps.prereq.outputs.need_ros2 == '1' }}
3838
with:
3939
use-ros2-testing: true

0 commit comments

Comments
 (0)