latest from moveit2

Author: tylerjw

.github/workflows/industrial_ci_action.yml

@@ -30,17 +30,19 @@ jobs:
       BASEDIR: ${{ github.workspace }}/.work
       CACHE_PREFIX: "${{ matrix.env.IMAGE }}${{ matrix.env.CCOV && '-ccov' || '' }}"
 
+    name: "${{ matrix.env.IMAGE }}${{ matrix.env.CCOV && ' + ccov' || ''}}"
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - name: cache upstream_ws
         uses: pat-s/always-upload-cache@v2.1.3
         with:
           path: ${{ env.BASEDIR }}/upstream_ws
-          key: upstream_ws-${{ env.CACHE_PREFIX }}-${{ hashFiles('upstream.repos') }}-${{ github.run_id }}
+          key: upstream_ws-${{ env.CACHE_PREFIX }}-${{ hashFiles('moveit2.repos') }}-${{ github.run_id }}
           restore-keys: |
-            upstream_ws-${{ env.CACHE_PREFIX }}-${{ hashFiles('upstream.repos') }}
+            upstream_ws-${{ env.CACHE_PREFIX }}-${{ hashFiles('moveit2.repos') }}
       - name: cache target_ws
+        if: ${{ ! env.CCOV }}
         uses: pat-s/always-upload-cache@v2.1.3
         with:
           path: ${{ env.BASEDIR }}/target_ws
@@ -70,12 +72,9 @@ jobs:
         with:
           files: ${{ env.BASEDIR }}/coverage.info
       - name: prepare target_ws for cache
-        if: always()
-        run: |
+        if: ${{ always() && ! env.CCOV }}
+        run:
           du -sh ${{ env.BASEDIR }}/target_ws
-          sudo find ${{ env.BASEDIR }}/target_ws -name '*.gcov' -type f -delete
-          sudo find ${{ env.BASEDIR }}/target_ws -name '*.gcno' -type f -delete
-          sudo find ${{ env.BASEDIR }}/target_ws -name '*.gcda' -type f -delete
-          sudo find ${{ env.BASEDIR }}/target_ws -name '*/test_results*' -delete
+          sudo find ${{ env.BASEDIR }}/target_ws -wholename '*/test_results/*' -delete
           sudo rm -rf ${{ env.BASEDIR }}/target_ws/src
           du -sh ${{ env.BASEDIR }}/target_ws