WIP

Author: ericbottard

.github/workflows/eric-continuous-integration.yml

@@ -111,11 +111,19 @@ jobs:
           distribution: 'temurin'
           cache: 'maven'
 
-      - name: Download Maven repository
+      - name: Setup Maven Build-Cache (~/.m2/build-cache)
+        uses: actions/cache@v4
+        with:
+          path: ~/.m2/build-cache
+          key: build-cache-${{ runner.os }}-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            build-cache-${{ runner.os }}-
+
+      - name: Download Spring-AI Built Artifacts
         uses: actions/download-artifact@v4
         with:
-          name: maven-repo
-          path: ~/.m2/repository
+          name: build-artifacts
+          path: ~/.m2/repository/org/springframework/ai
 
       - name: Configure Testcontainers
         run: |
@@ -148,11 +156,19 @@ jobs:
           distribution: 'temurin'
           cache: 'maven'
 
-      - name: Download Maven repository
+      - name: Setup Maven Build-Cache (~/.m2/build-cache)
+        uses: actions/cache@v4
+        with:
+          path: ~/.m2/build-cache
+          key: build-cache-${{ runner.os }}-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            build-cache-${{ runner.os }}-
+
+      - name: Download Spring-AI Built Artifacts
         uses: actions/download-artifact@v4
         with:
-          name: maven-repo
-          path: ~/.m2/repository
+          name: build-artifacts
+          path: ~/.m2/repository/org/springframework/ai
 
       - name: Configure Testcontainers
         run: |
@@ -173,7 +189,7 @@ jobs:
     name: Generate documentation artifacts
     runs-on: ubuntu-latest
     needs: [build-all, test-ollama, test-openai, test-remaining]
-    if: ${{ (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/1.1.x') && github.repository_owner == 'spring-projects' }}
+    if: ${{ github.repository_owner == 'spring-projects' }}
     steps:
       - name: Checkout source code
         uses: actions/checkout@v4
@@ -185,11 +201,13 @@ jobs:
           distribution: 'temurin'
           cache: 'maven'
 
-      - name: Download Maven repository
-        uses: actions/download-artifact@v4
+      - name: Setup Maven Build-Cache (~/.m2/build-cache)
+        uses: actions/cache@v4
         with:
-          name: maven-repo
-          path: ~/.m2/repository
+          path: ~/.m2/build-cache
+          key: build-cache-${{ runner.os }}-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            build-cache-${{ runner.os }}-
 
       - name: Generate Java docs
         run: ./mvnw --batch-mode -ntp javadoc:aggregate
@@ -216,7 +234,7 @@ jobs:
     name: Deploy to Artifactory
     runs-on: ubuntu-latest
     needs: [build-all, test-ollama, test-openai, test-remaining]
-    if: ${{ (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/1.1.x') && github.repository_owner == 'spring-projects' }}
+    if: ${{ github.repository_owner == 'spring-projects' }}
     steps:
       - name: Checkout source code
         uses: actions/checkout@v4
@@ -228,24 +246,32 @@ jobs:
           distribution: 'temurin'
           cache: 'maven'
 
-      - name: Download Maven repository
+      - name: Setup Maven Build-Cache (~/.m2/build-cache)
+        uses: actions/cache@v4
+        with:
+          path: ~/.m2/build-cache
+          key: build-cache-${{ runner.os }}-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            build-cache-${{ runner.os }}-
+
+      - name: Download Spring-AI Built Artifacts
         uses: actions/download-artifact@v4
         with:
-          name: maven-repo
-          path: ~/.m2/repository
+          name: build-artifacts
+          path: ~/.m2/repository/org/springframework/ai
 
       - name: Deploy to Artifactory
         env:
           ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
           ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
         run: |
-          ./mvnw -s settings.xml --batch-mode -ntp -DskipTests deploy
+          ./mvnw -s settings.xml --batch-mode -ntp -Dmaven.test.skip -Dmaven.javadoc.skip deploy
 
-  deploy-docs:
+  deploy-docs: #JAVADOCS only, and double management!!?
     name: Deploy documentation
     runs-on: ubuntu-latest
     needs: [generate-artifacts]
-    if: ${{ (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/1.1.x') && github.repository_owner == 'spring-projects' }}
+    if: ${{ github.repository_owner == 'spring-projects' }}
     steps:
       - name: Checkout source code
         uses: actions/checkout@v4