Skip to content

Commit dbf2654

Browse files
committed
workflows: clean up repo artefacts from base image, repair build action
1 parent 832bf62 commit dbf2654

File tree

2 files changed

+11
-21
lines changed

2 files changed

+11
-21
lines changed

.github/workflows/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,5 @@ RUN find . -name "*.repos" -exec vcs import --recursive --input {} src \;
2424
RUN rosdep update && \
2525
. /opt/ros/${ROS_DISTRO}/setup.sh && \
2626
rosdep install --from-paths src --ignore-src --skip-keys "python3-unified-planning-pip python3-sb3-contrib-pip" -r -y
27+
28+
RUN rm -rfd src

.github/workflows/build_tests.yaml

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,27 +11,22 @@ jobs:
1111
runs-on: ubuntu-24.04
1212
container:
1313
image: quay.io/carologistics/clips_executive_base_image:kilted
14-
options: --user root
14+
options: --user root --workdir /ros_ws
1515
steps:
16-
- name: Checkout repository
17-
uses: actions/checkout@v3
18-
with:
19-
fetch-depth: 0 # ensures full git history is present
20-
2116
- name: Install pre-commit
2217
run: |
2318
apt update && apt install -y pre-commit git
2419
20+
- name: Checkout repository
21+
uses: actions/checkout@v6
22+
with:
23+
fetch-depth: 0
24+
2525
- name: Run pre-commit hooks
26-
working-directory: /github/workspace
2726
run: |
28-
# Source ROS environment
27+
ls -lha
2928
. /opt/ros/kilted/setup.sh
30-
31-
# Run pre-commit in the repository
3229
pre-commit run --all-files --hook-stage manual
33-
env:
34-
PRE_COMMIT_HOME: /var/cache/pre-commit
3530
3631
ros-build:
3732
runs-on: ubuntu-24.04
@@ -41,22 +36,15 @@ jobs:
4136
ros_distro: [humble, jazzy, kilted]
4237
container:
4338
image: quay.io/carologistics/clips_executive_base_image:${{ matrix.ros_distro }}
44-
options: --user root
39+
options: --user root --workdir /ros_ws
4540
steps:
4641
- name: Checkout repository
47-
uses: actions/checkout@v3
42+
uses: actions/checkout@v6
4843

4944
- name: Build ROS workspace
5045
run: |
5146
set -e
5247
export ROS_DISTRO=${{ matrix.ros_distro }}
5348
echo "Building workspace for $ROS_DISTRO"
5449
. /opt/ros/$ROS_DISTRO/setup.sh
55-
cd /ros_ws
5650
colcon build --merge-install --cmake-args -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_TESTING=OFF
57-
58-
- name: Run ROS tests
59-
run: |
60-
. /opt/ros/${{ matrix.ros_distro }}/setup.sh
61-
cd /ros_ws
62-
colcon test

0 commit comments

Comments
 (0)