From b57e6e1fe846b56140f73abaa2a9901d9cec5602 Mon Sep 17 00:00:00 2001
From: Yutaka Kondo <yutaka.kondo@youtalk.jp>
Date: Wed, 17 Jul 2024 06:25:12 +0900
Subject: [PATCH] refactor(ci): remove obsolete ccache `restore-keys` (#4992)

remove obsolete restore-keys

Signed-off-by: Yutaka Kondo <yutaka.kondo@youtalk.jp>
---
 .github/actions/docker-build-and-push/action.yaml | 5 +----
 .github/actions/docker-build/action.yaml          | 6 ------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/.github/actions/docker-build-and-push/action.yaml b/.github/actions/docker-build-and-push/action.yaml
index aae6a9747f2..4cf51296cdd 100644
--- a/.github/actions/docker-build-and-push/action.yaml
+++ b/.github/actions/docker-build-and-push/action.yaml
@@ -44,18 +44,15 @@ runs:
     - name: Setup Docker Buildx
       uses: docker/setup-buildx-action@v3
 
-    # TODO(youtalk): Remove obsolete "cache-" restore-keys
     - name: Restore ccache
       uses: actions/cache/restore@v4
       with:
         path: |
           root-ccache
-        key: cache-${{ inputs.platform }}-${{ inputs.name }}-${{ hashFiles('src/**/*.cpp') }}
+        key: ccache-${{ inputs.platform }}-${{ inputs.name }}-${{ hashFiles('src/**/*.cpp') }}
         restore-keys: |
           ccache-${{ inputs.platform }}-${{ inputs.name }}-
           ccache-${{ inputs.platform }}-
-          cache-${{ inputs.platform }}-${{ inputs.name }}-
-          cache-${{ inputs.platform }}-
 
     - name: Restore apt-get
       uses: actions/cache/restore@v4
diff --git a/.github/actions/docker-build/action.yaml b/.github/actions/docker-build/action.yaml
index ed992a8a1ba..67c2513ddc3 100644
--- a/.github/actions/docker-build/action.yaml
+++ b/.github/actions/docker-build/action.yaml
@@ -34,7 +34,6 @@ runs:
         vcs import src < autoware.repos
       shell: bash
 
-    # TODO(youtalk): Remove obsolete "cache-" restore-keys
     - name: Cache ccache
       uses: actions/cache@v4
       if: ${{ inputs.name == 'no-cuda' && github.ref == 'refs/heads/main' }}
@@ -46,8 +45,6 @@ runs:
         restore-keys: |
           ccache-${{ inputs.platform }}-${{ inputs.name }}-
           ccache-${{ inputs.platform }}-
-          cache-${{ inputs.platform }}-${{ inputs.name }}-
-          cache-${{ inputs.platform }}-
 
     - name: Cache apt-get
       uses: actions/cache@v4
@@ -62,7 +59,6 @@ runs:
           apt-get-${{ inputs.platform }}-${{ inputs.name }}-
           apt-get-${{ inputs.platform }}-
 
-    # TODO(youtalk): Remove obsolete "cache-" restore-keys
     - name: Restore ccache
       uses: actions/cache/restore@v4
       if: ${{ inputs.name != 'no-cuda' || github.ref != 'refs/heads/main' }}
@@ -73,8 +69,6 @@ runs:
         restore-keys: |
           ccache-${{ inputs.platform }}-${{ inputs.name }}-
           ccache-${{ inputs.platform }}-
-          cache-${{ inputs.platform }}-${{ inputs.name }}-
-          cache-${{ inputs.platform }}-
 
     - name: Restore apt-get
       uses: actions/cache/restore@v4