From 7f7d5f9ddd25a980d50b6a4632e72900d4cca942 Mon Sep 17 00:00:00 2001
From: Gerrod Ubben <gerrodubben@gmail.com>
Date: Tue, 22 Oct 2024 09:39:08 -0400
Subject: [PATCH] Fix cache invalidation command

---
 .github/actions/base_images/action.yml | 3 +--
 .github/workflows/ci.yml               | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/actions/base_images/action.yml b/.github/actions/base_images/action.yml
index bc2938e3..42bc97ad 100644
--- a/.github/actions/base_images/action.yml
+++ b/.github/actions/base_images/action.yml
@@ -106,8 +106,7 @@ runs:
       if: env.BUILD_IMAGES && steps.cache.outputs.cache-hit == 'true'
       run: |
         echo "Deleting existing cache for ${{ steps.hash_key.outputs.base_cache_key }}"
-        gh extension install actions/gh-actions-cache
-        gh actions-cache delete "base-images=${{ steps.hash_key.outputs.base_cache_key }}" --R ${{ github.repository }} -B ${{ github.ref }} --confirm
+        gh cache delete "base-images=${{ steps.hash_key.outputs.base_cache_key }}" -R ${{ github.repository }}
       shell: bash
 
     - name: Cache podman images
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ec7e1058..cd7a2e4c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -57,6 +57,8 @@ jobs:
       - name: Build base images
         id: build_base_images
         uses: "./.github/actions/base_images"
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           python_version: "3.9"
 
@@ -78,8 +80,6 @@ jobs:
       - name: Build App Image
         id: build_image
         uses: "./.github/actions/build_image"
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           image_name: ${{ matrix.image_name }}
           image_variant: "stable"