Add rosdistro version to upstream ws cache prefix (#952)

moveit · Jan 3, 2022 · ab230fb · ab230fb
1 parent a9cc2bb
commit ab230fb
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -18,11 +18,15 @@ jobs:
         env:
           - IMAGE: rolling-ci
             CCOV: true
+            ROS_DISTRO: rolling
           - IMAGE: rolling-ci-testing
             IKFAST_TEST: true
+            ROS_DISTRO: rolling
           - IMAGE: galactic-ci
             CLANG_TIDY: pedantic
+            ROS_DISTRO: galactic
           - IMAGE: galactic-ci-testing
+            ROS_DISTRO: galactic
     env:
       CXXFLAGS: "-Wall -Wextra -Wwrite-strings -Wunreachable-code -Wpointer-arith -Wredundant-decls -Wno-deprecated-copy"
       DOCKER_IMAGE: ghcr.io/ros-planning/moveit2:${{ matrix.env.IMAGE }}
@@ -66,14 +70,19 @@ jobs:
           sudo rm -rf /usr/local
           df -h
       - uses: actions/checkout@v2
+      - name: Get latest release date for rosdistro
+        id: rosdistro_release_date
+        uses: JafarAbdi/latest-rosdistro-release-date-action@main
+        with:
+          rosdistro: ${{ matrix.env.ROS_DISTRO }}
       - name: Cache upstream workspace
         uses: pat-s/always-upload-cache@v2.1.5
         with:
           path: ${{ env.BASEDIR }}/upstream_ws
           key: ${{ env.CACHE_PREFIX }}-${{ github.run_id }}
           restore-keys: ${{ env.CACHE_PREFIX }}
         env:
-          CACHE_PREFIX: upstream_ws-${{ matrix.env.IMAGE }}-${{ hashFiles('moveit2*.repos', '.github/workflows/ci.yaml') }}
+          CACHE_PREFIX: ${{ steps.rosdistro_release_date.outputs.date }}-upstream_ws-${{ matrix.env.IMAGE }}-${{ hashFiles('moveit2*.repos', '.github/workflows/ci.yaml') }}
       # The target directory cache doesn't include the source directory because
       # that comes from the checkout.  See "prepare target_ws for cache" task below
       - name: Cache target workspace