Use explicit save/restore cache actions.

This is to force a save, even in case
of cache hit, as the contents of the directory may
have changed.

Signed-off-by: Eric Bottard <[email protected]>

Auto-cherry-pick to 1.1.x

Author: ericbottard

.github/workflows/continuous-integration.yml

@@ -29,19 +29,25 @@ jobs:
           distribution: 'temurin'
           cache: 'maven'
 
-      - name: Setup Maven Build-Cache (~/.m2/build-cache)
+      - name: Restore Maven Build-Cache (~/.m2/build-cache)
         if: ${{ github.event_name != 'schedule' }}
-        uses: actions/cache@v4
+        uses: actions/cache/restore@v4
         with:
           path: ~/.m2/build-cache
-          key: build-cache-${{ runner.os }}-${{ hashFiles('**/pom.xml') }}
+          key: build-cache-${{ runner.os }}-${{ hashFiles('**/pom.xml', '!**/target/**') }}
           restore-keys: |
             build-cache-${{ runner.os }}-
 
       - name: Build all modules with unit tests
         run: |
           ./mvnw --batch-mode -ntp --update-snapshots clean install
 
+      - name: Save Maven Build-Cache (~/.m2/build-cache)
+        uses: actions/cache/save@v4
+        with:
+          path: ~/.m2/build-cache
+          key: build-cache-${{ runner.os }}-${{ hashFiles('**/pom.xml', '!**/target/**') }}
+
       - name: Upload Spring-AI Built Artifacts
         uses: actions/upload-artifact@v4
         with:
@@ -78,12 +84,12 @@ jobs:
           distribution: 'temurin'
           cache: 'maven'
 
-      - name: Setup Maven Build-Cache (~/.m2/build-cache)
-        uses: actions/cache@v4
+      - name: Restore Maven Build-Cache (~/.m2/build-cache)
         if: ${{ github.event_name != 'schedule' }}
+        uses: actions/cache/restore@v4
         with:
           path: ~/.m2/build-cache
-          key: build-cache-${{ runner.os }}-ollama-${{ hashFiles('**/pom.xml') }}
+          key: build-cache-${{ runner.os }}-ollama-${{ hashFiles('**/pom.xml', '!**/target/**') }}
           restore-keys: |
             build-cache-${{ runner.os }}-
 
@@ -108,6 +114,12 @@ jobs:
             -Dfailsafe.rerunFailingTestsCount=3 \
             verify
 
+      - name: Save Maven Build-Cache (~/.m2/build-cache)
+        uses: actions/cache/save@v4
+        with:
+          path: ~/.m2/build-cache
+          key: build-cache-${{ runner.os }}-ollama-${{ hashFiles('**/pom.xml', '!**/target/**') }}
+
   test-openai:
     name: Test OpenAI
     if: ${{ github.repository_owner == 'spring-projects' }}
@@ -124,11 +136,12 @@ jobs:
           distribution: 'temurin'
           cache: 'maven'
 
-      - name: Setup Maven Build-Cache (~/.m2/build-cache)
-        uses: actions/cache@v4
+      - name: Restore Maven Build-Cache (~/.m2/build-cache)
+        if: ${{ github.event_name != 'schedule' }}
+        uses: actions/cache/restore@v4
         with:
           path: ~/.m2/build-cache
-          key: build-cache-${{ runner.os }}-openai-${{ hashFiles('**/pom.xml') }}
+          key: build-cache-${{ runner.os }}-openai-${{ hashFiles('**/pom.xml', '!**/target/**') }}
           restore-keys: |
             build-cache-${{ runner.os }}-
 
@@ -153,6 +166,12 @@ jobs:
             -Dfailsafe.rerunFailingTestsCount=3 \
             verify
 
+      - name: Save Maven Build-Cache (~/.m2/build-cache)
+        uses: actions/cache/save@v4
+        with:
+          path: ~/.m2/build-cache
+          key: build-cache-${{ runner.os }}-openai-${{ hashFiles('**/pom.xml', '!**/target/**') }}
+
   test-remaining:
     name: Test Remaining (MCP, Google GenAI, Chroma, PgVector)
     if: ${{ github.repository_owner == 'spring-projects' }}
@@ -169,11 +188,12 @@ jobs:
           distribution: 'temurin'
           cache: 'maven'
 
-      - name: Setup Maven Build-Cache (~/.m2/build-cache)
-        uses: actions/cache@v4
+      - name: Restore Maven Build-Cache (~/.m2/build-cache)
+        if: ${{ github.event_name != 'schedule' }}
+        uses: actions/cache/restore@v4
         with:
           path: ~/.m2/build-cache
-          key: build-cache-${{ runner.os }}-other-${{ hashFiles('**/pom.xml') }}
+          key: build-cache-${{ runner.os }}-other-${{ hashFiles('**/pom.xml', '!**/target/**') }}
           restore-keys: |
             build-cache-${{ runner.os }}-
 
@@ -198,6 +218,12 @@ jobs:
             -Dfailsafe.rerunFailingTestsCount=3 \
             verify
 
+      - name: Save Maven Build-Cache (~/.m2/build-cache)
+        uses: actions/cache/save@v4
+        with:
+          path: ~/.m2/build-cache
+          key: build-cache-${{ runner.os }}-other-${{ hashFiles('**/pom.xml', '!**/target/**') }}
+
   handle-documentation:
     name: Generate and upload javadocs, trigger antora reference doc
     if: ${{  github.repository_owner == 'spring-projects'  && github.event_name != 'schedule'}}
@@ -259,11 +285,12 @@ jobs:
           distribution: 'temurin'
           cache: 'maven'
 
-      - name: Setup Maven Build-Cache (~/.m2/build-cache)
-        uses: actions/cache@v4
+      - name: Restore Maven Build-Cache (~/.m2/build-cache)
+        if: ${{ github.event_name != 'schedule' }}
+        uses: actions/cache/restore@v4
         with:
           path: ~/.m2/build-cache
-          key: build-cache-${{ runner.os }}-${{ hashFiles('**/pom.xml') }}
+          key: build-cache-${{ runner.os }}-${{ hashFiles('**/pom.xml', '!**/target/**') }}
           restore-keys: |
             build-cache-${{ runner.os }}-
 

.github/workflows/pr-check.yml

@@ -19,14 +19,20 @@ jobs:
           distribution: 'temurin'
           cache: 'maven'
 
-      - name: Setup Maven Build-Cache (~/.m2/build-cache)
-        uses: actions/cache@v4
+      - name: Restore Maven Build-Cache (~/.m2/build-cache)
+        uses: actions/cache/restore@v4
         with:
           path: ~/.m2/build-cache
-          key: build-cache-${{ runner.os }}-${{ hashFiles('**/pom.xml') }}
+          key: build-cache-${{ runner.os }}-${{ hashFiles('**/pom.xml', '!**/target/**') }}
           restore-keys: |
             build-cache-${{ runner.os }}-
 
       - name: Run tests
         run: |
           ./mvnw -ntp -B -U test
+
+      - name: Save Maven Build-Cache (~/.m2/build-cache)
+        uses: actions/cache/save@v4
+        with:
+          path: ~/.m2/build-cache
+          key: build-cache-${{ runner.os }}-${{ hashFiles('**/pom.xml', '!**/target/**') }}