try caching whole workspaces

moveit · Mar 22, 2021 · 0c428c2 · 0c428c2
1 parent 0af3986
commit 0c428c2
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 14 deletions.
diff --git a/.github/workflows/industrial_ci_action.yml b/.github/workflows/industrial_ci_action.yml
@@ -11,33 +11,52 @@ jobs:
       matrix:
         env:
           - {
-            ROS_DISTRO: foxy, ROS_REPO: main, CCOV_UPLOAD: true,
+            ROS_DISTRO: foxy, 
+            ROS_REPO: main, 
+            CCOV_UPLOAD: true,
             CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS='--coverage' -DCMAKE_CXX_FLAGS='--coverage'",
             AFTER_RUN_TARGET_TEST: './.ci.prepare_codecov',
-            ADDITIONAL_DEBS: 'curl lcov grep'
+            ADDITIONAL_DEBS: 'lcov'
+          }
+          - {
+            ROS_DISTRO: foxy, 
+            ROS_REPO: testing, 
+            CCOV_UPLOAD: false
           }
-          - {ROS_DISTRO: foxy, ROS_REPO: testing, CCOV_UPLOAD: false}
     env:
-      UPSTREAM_WORKSPACE: warehouse_ros_mongo.repos
-      CCACHE_DIR: /home/runner/.ccache
-      BASEDIR: .base
+      UPSTREAM_WORKSPACE: upstream.repos
+      AFTER_SETUP_UPSTREAM_WORKSPACE: 'vcs pull $BASEDIR/upstream_ws/src'
+      CCACHE_DIR: "${{ github.workspace }}/.ccache"
+      BASEDIR: ${{ github.workspace }}/.work
+      CACHE_PREFIX: "${{ matrix.ROS_DISTRO }}-${{ matrix.ROS_REPO }}${{ matrix.CCOV_UPLOAD && '-ccov' || '' }}"
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/cache@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 }}
+          restore-keys: |
+            upstream_ws-${{ env.CACHE_PREFIX }}-${{ hashFiles('upstream.repos') }}
+      - name: cache ccache
+        uses: pat-s/always-upload-cache@v2.1.3
         with:
           path: ${{ env.CCACHE_DIR }}
-          key: ccache-${{ matrix.env.ROS_DISTRO }}-${{ matrix.env.ROS_REPO }}-${{ github.sha }}  
+          key: ccache-${{ env.CACHE_PREFIX }}-${{ github.sha }}  
           restore-keys: |
-            ccache-${{ matrix.env.ROS_DISTRO }}-${{ matrix.env.ROS_REPO }}
-      - uses: 'ros-industrial/industrial_ci@master'
+            ccache-${{ env.CACHE_PREFIX }}
+      - name: industrial_ci
+        uses: 'ros-industrial/industrial_ci@master'
         env: ${{ matrix.env }}
-      - uses: actions/upload-artifact@v2
+      - name: upload test artifacts (on failure)
+        uses: actions/upload-artifact@v2
         if: failure()
         with:
           name: test-results
           path: ${{ env.BASEDIR }}/target_ws/**/test_results/**/*.xml
-      - uses: codecov/codecov-action@v1
+      - name: upload codecov report
+        uses: codecov/codecov-action@v1
         if: ${{ matrix.env.CCOV_UPLOAD }} 
         with:
           files: ${{ env.BASEDIR }}/coverage.info
diff --git a/README.md b/README.md
@@ -6,8 +6,6 @@ Code for persisting ROS message data using MongoDB.  Contains C++ and Python lib
 
 [![Format](https://github.com/ros-planning/warehouse_ros_mongo/actions/workflows/format.yml/badge.svg?branch=ros2)](https://github.com/ros-planning/warehouse_ros_mongo/actions/workflows/format.yml?branch=ros2) [![BuildAndTest](https://github.com/ros-planning/warehouse_ros_mongo/actions/workflows/industrial_ci_action.yml/badge.svg?branch=ros2)](https://github.com/ros-planning/warehouse_ros_mongo/actions/workflows/industrial_ci_action.yml?branch=ros2) [![codecov](https://codecov.io/gh/ros-planning/warehouse_ros_mongo/branch/ros2/graph/badge.svg?token=W7uHKcY0ly)](https://codecov.io/gh/ros-planning/warehouse_ros_mongo)
 
-[![Code Coverage Grid](https://codecov.io/gh/ros-planning/warehouse_ros_mongo/branch/ros2/graphs/tree.svg)](https://codecov.io/gh/ros-planning/warehouse_ros_mongo/branch/ros2/graphs/tree.svg)
-
 ## Building from source
 
 ### ROS Jade  / Kinetic

diff --git a/warehouse_ros_mongo.repos → upstream.repos b/warehouse_ros_mongo.repos → upstream.repos