Skip to content

Commit 62c31f1

Browse files
committed
can we make it more sane by running the whole thing in the container?
1 parent a561251 commit 62c31f1

File tree

1 file changed

+5
-19
lines changed

1 file changed

+5
-19
lines changed

.github/workflows/ci.yaml

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -71,21 +71,8 @@ jobs:
7171

7272
name: ${{ matrix.env.IMAGE }}${{ matrix.env.CCOV && ' + ccov' || ''}}${{ matrix.env.IKFAST_TEST && ' + ikfast' || ''}}${{ matrix.env.CLANG_TIDY && (github.event_name != 'workflow_dispatch' && ' + clang-tidy (delta)' || ' + clang-tidy (all)') || '' }}
7373
runs-on: ubuntu-latest
74+
container: moveit/moveit2:${{ matrix.env.IMAGE }}
7475
steps:
75-
- name: "Free up disk space"
76-
if: matrix.env.CCOV
77-
run: |
78-
sudo apt-get -qq purge "ghc*"
79-
sudo apt-get clean
80-
# cleanup docker images not used by us
81-
docker system prune -af
82-
# shift ccache folder to /mnt on a separate disk
83-
sudo mkdir /mnt/ccache
84-
mkdir ${{ env.CCACHE_DIR }}
85-
sudo mount --bind ${{ env.CCACHE_DIR }} /mnt/ccache
86-
# free up a lot of stuff from /usr/local
87-
sudo rm -rf /usr/local
88-
df -h
8976
- uses: actions/checkout@v6
9077
# NOTE: Testspace is temporarily disabled and needs to be installed for the MoveIt org
9178
# See: https://github.com/moveit/moveit2/issues/2852
@@ -145,7 +132,10 @@ jobs:
145132
- id: ici
146133
name: Run industrial_ci
147134
uses: ros-industrial/industrial_ci@master
148-
env: ${{ matrix.env }}
135+
env:
136+
CCOV: ${{ matrix.env.CCOV }}
137+
CLANG_TIDY: ${{ matrix.env.CLANG_TIDY }}
138+
ROS_DISTRO: ${{ matrix.env.ROS_DISTRO }}
149139
# NOTE: Testspace is temporarily disabled and needs to be installed for the MoveIt org
150140
# See: https://github.com/moveit/moveit2/issues/2852
151141
# - name: Push result to Testspace
@@ -178,10 +168,6 @@ jobs:
178168
with:
179169
name: clang-tidy
180170
path: ${{ env.BASEDIR }}/target_ws/src/$(basename $(pwd))
181-
- name: chown the target_ws because it came out of root-owned Docker container filesystem
182-
run: sudo chown -R "$USER:$USER" ${{ env.BASEDIR }}/target_ws
183-
- name: move sonar-project.properties from checkout into ICI output
184-
run: mv sonar-project.properties ${{ env.BASEDIR }}/target_ws
185171
- name: SonarQube Scan
186172
# Don't run if SONAR_TOKEN is not set (i.e. PR job from a fork)
187173
if: matrix.env.CCOV && steps.ici.outputs.target_test_results == '0' && env.SONAR_TOKEN != ''

0 commit comments

Comments
 (0)