From 77d7655401c68c763b065b3272a2687ccc32e75f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=2E=20Fatih=20C=C4=B1r=C4=B1t?= <mfc@leodrive.ai>
Date: Wed, 26 Jun 2024 18:16:24 +0300
Subject: [PATCH] refactor: add missing input to colcon-test and add
 cache-key-element
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: M. Fatih Cırıt <mfc@leodrive.ai>
---
 clang-tidy/action.yaml   |  6 +++++-
 colcon-build/action.yaml |  6 +++++-
 colcon-test/action.yaml  | 10 +++++++++-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/clang-tidy/action.yaml b/clang-tidy/action.yaml
index be96e559..f3eb057e 100644
--- 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
index 84e1cbbd..bb9081c3 100644
--- 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
index 7e005778..194b3de7 100644
--- 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: |