refactor: add missing input to colcon-test and add cache-key-element

Signed-off-by: M. Fatih Cırıt <[email protected]>
autowarefoundation · Jun 26, 2024 · 77d7655 · 77d7655
1 parent 92b8188
commit 77d7655
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/clang-tidy/action.yaml b/clang-tidy/action.yaml
@@ -28,6 +28,10 @@ inputs:
   include-eol-distros:
     description: ""
     required: false
+  cache-key-element:
+    description: "Will be part of the cache key"
+    default: "default"
+    required: false
 
 runs:
   using: composite
@@ -88,7 +92,7 @@ runs:
         path: |
           ./build
           ./install
-        key: build-${{ inputs.rosdistro }}-${{ runner.os }}-${{ runner.arch }}-${{ inputs.cmake-build-type }}-${{ github.sha }}
+        key: build-${{ inputs.rosdistro }}-${{ runner.arch }}-${{ inputs.cache-key-element }}-${{ inputs.cmake-build-type }}-${{ github.sha }}
 
     - name: Build
       if: ${{ steps.restore-build-files.outputs.cache-hit != 'true' }}

diff --git a/colcon-build/action.yaml b/colcon-build/action.yaml
@@ -22,6 +22,10 @@ inputs:
   include-eol-distros:
     description: ""
     required: false
+  cache-key-element:
+    description: "Will be part of the cache key"
+    default: "default"
+    required: false
 
 runs:
   using: composite
@@ -90,4 +94,4 @@ runs:
         path: |
           ./build
           ./install
-        key: build-${{ inputs.rosdistro }}-${{ runner.os }}-${{ runner.arch }}-${{ inputs.cmake-build-type }}-${{ github.sha }}
+        key: build-${{ inputs.rosdistro }}-${{ runner.arch }}-${{ inputs.cache-key-element }}-${{ inputs.cmake-build-type }}-${{ github.sha }}
diff --git a/colcon-test/action.yaml b/colcon-test/action.yaml
@@ -11,6 +11,10 @@ inputs:
   build-depends-repos:
     description: ""
     required: false
+  cmake-build-type:
+    description: ""
+    required: false
+    default: Release
   label-regex:
     description: ""
     required: false
@@ -22,6 +26,10 @@ inputs:
   include-eol-distros:
     description: ""
     required: false
+  cache-key-element:
+    description: "Will be part of the cache key"
+    default: "default"
+    required: false
 outputs:
   coverage-report-files:
     description: ""
@@ -84,7 +92,7 @@ runs:
         path: |
           ./build
           ./install
-        key: build-${{ inputs.rosdistro }}-${{ runner.os }}-${{ runner.arch }}-${{ inputs.cmake-build-type }}-${{ github.sha }}
+        key: build-${{ inputs.rosdistro }}-${{ runner.arch }}-${{ inputs.cache-key-element }}-${{ inputs.cmake-build-type }}-${{ github.sha }}
 
     - name: Test
       run: |