From b2c64ba3f00599a259d117499866bf7f38bb4a96 Mon Sep 17 00:00:00 2001
From: Matt Kilgore <matthew@kilgore.dev>
Date: Sat, 4 Jan 2025 18:40:11 -0500
Subject: [PATCH] Testing some things

---
 .github/workflows/docker-publish-rootless.yaml | 9 ++++++++-
 .github/workflows/docker-publish.yaml          | 8 ++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/docker-publish-rootless.yaml b/.github/workflows/docker-publish-rootless.yaml
index 59e1ad66..3d48c0cf 100644
--- a/.github/workflows/docker-publish-rootless.yaml
+++ b/.github/workflows/docker-publish-rootless.yaml
@@ -45,10 +45,17 @@ jobs:
           - linux/arm/v7
 
     steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
       - name: Prepare
         run: |
           platform=${{ matrix.platform }}
           echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
+          branch=${{ github.event.pull_request.number || github.ref }}
+          echo "BRANCH=${branch//\//-}" >> $GITHUB_ENV
+          echo ${{ env.PLATFORM_PAIR }}-${{ env.BRANCH }}-rootless
+          
 
       - name: Docker meta
         id: meta
@@ -89,7 +96,7 @@ jobs:
           platforms: ${{ matrix.platform }}
           labels: ${{ steps.meta.outputs.labels }}
           outputs: type=image,"name=${{ env.DOCKERHUB_REPO }},${{ env.GHCR_REPO }}",push-by-digest=true,name-canonical=true,push=true
-          cache-from: type=registry,ref=ghcr.io/sysadminsmedia/devcache
+          cache-from: type=registry,ref=ghcr.io/sysadminsmedia/devcache:${{ env.PLATFORM_PAIR }}-${{ env.BRANCH }}-rootless
           cache-to: type=registry,ref=ghcr.io/sysadminsmedia/devcache,mode=max
 
       - name: Export digest
diff --git a/.github/workflows/docker-publish.yaml b/.github/workflows/docker-publish.yaml
index d71e3610..0ba886cc 100644
--- a/.github/workflows/docker-publish.yaml
+++ b/.github/workflows/docker-publish.yaml
@@ -46,6 +46,14 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
+      - name: Prepare
+        run: |
+          platform=${{ matrix.platform }}
+          echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
+          branch=${{ github.event.pull_request.number || github.ref }}
+          echo "BRANCH=${branch//\//-}" >> $GITHUB_ENV
+          echo ${{ env.PLATFORM_PAIR }}-${{ env.BRANCH }}
+
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@v5