From b36e3a10f7065679889eeac8a3ae47a7fe64a939 Mon Sep 17 00:00:00 2001
From: Hao Xia <hao@shinami.com>
Date: Tue, 1 Oct 2024 23:10:11 -0700
Subject: [PATCH] Delete legacy cache

---
 .github/workflows/docker.yaml | 12 ++----------
 docker-bake.hcl               |  6 ------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
index bc33117..cb47b22 100644
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@@ -45,19 +45,11 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      - name: Bake and populate builder-base cache
+      - name: Bake and populate builder-base and runtime-base cache
         if: github.event_name == 'push'
         uses: docker/bake-action@v5
         with:
-          targets: cache-builder-base
-        env:
-          PLATFORM: ${{ matrix.platform }}
-
-      - name: Bake and populate runtime-base cache
-        if: github.event_name == 'push'
-        uses: docker/bake-action@v5
-        with:
-          targets: cache-runtime-base
+          targets: cache-builder-base,cache-runtime-base
         env:
           PLATFORM: ${{ matrix.platform }}
 
diff --git a/docker-bake.hcl b/docker-bake.hcl
index 26e0396..42c1dc9 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -6,11 +6,6 @@ variable "_PLATFORM_TAG" {
   default = regex_replace(PLATFORM, "/", "-")
 }
 
-# TODO - delete
-variable "_REMOTE_CACHE_LEGACY" {
-  default = "type=registry,ref=ghcr.io/shinamicorp/aptos:cache-${_PLATFORM_TAG}"
-}
-
 variable "_REMOTE_CACHE_BUILDER_BASE" {
   default = "type=registry,ref=ghcr.io/shinamicorp/aptos:cache-builder-base-${_PLATFORM_TAG}"
 }
@@ -45,7 +40,6 @@ target "_common" {
     _REMOTE_CACHE_BUILDER_BASE,
     _REMOTE_CACHE_RUNTIME_BASE,
     _REMOTE_CACHE_BINARIES,
-    _REMOTE_CACHE_LEGACY,
   ]
 }