From 95bb78c9bc805d5afae751de9acb18d91df7e5c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9lder=20Greg=C3=B3rio?= <helder.gregorio@dremio.com>
Date: Thu, 22 Oct 2026 21:53:22 +0100
Subject: [PATCH] MINOR: [CI] Separate Maven caches by Docker image

Ubuntu and Conda JNI matrix jobs currently write the same immutable
Maven cache key for a given JDK and Maven version. Include the image in
the key and restore prefix so those jobs can save their own dependency
sets. Include Docker build configuration in the dependency hash while
retaining the existing POM and Compose inputs.
---
 .github/workflows/test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b9cd01a770..9e8c84cc31 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -66,8 +66,8 @@ jobs:
         uses: actions/cache@v6
         with:
           path: .docker
-          key: maven-${{ matrix.jdk }}-${{ matrix.maven }}-${{ hashFiles('compose.yaml', '**/pom.xml') }}
-          restore-keys: maven-${{ matrix.jdk }}-${{ matrix.maven }}-
+          key: maven-${{ matrix.image }}-${{ matrix.jdk }}-${{ matrix.maven }}-${{ hashFiles('compose.yaml', 'ci/docker/**', '**/pom.xml') }}
+          restore-keys: maven-${{ matrix.image }}-${{ matrix.jdk }}-${{ matrix.maven }}-
       - name: Execute Docker Build
         env:
           # Enables build caching, but not strictly required