improve CI caching

Author: mjacoby

.github/workflows/maven-build-pr.yml

@@ -17,8 +17,8 @@ jobs:
         # Disabling shallow clone is recommended for improving relevancy of reporting
         fetch-depth: 0
 
-    - name: Cache maven repository
-      uses: actions/cache@v5
+    - name: Restore Cache - Maven Repository
+      uses: actions/cache/restore@v5
       with:
         path: |
           ~/.m2/repository
@@ -51,12 +51,19 @@ jobs:
       run: |
         mvn install sonar:sonar -P coverage -Dsonar.projectKey=FraunhoferIOSB_FAAAST-Service --settings maven-ci-settings.xml -B
 
-    - name: Restore CVD Database from Cache
+    - name: Get Date
+      id: get-date
+      run: |
+        echo "date=$(/bin/date -u "+%Y-%m-%dT%H:%M:%S")" >> $GITHUB_OUTPUT
+      shell: bash
+
+    - name: Restore Cache - CVD Database
       uses: actions/cache/restore@v5
       with:
         path: |
           ~/.m2/repository/org/owasp/dependency-check-data
-        key: ${{ runner.os }}-maven-owasp-cvedb
+        key: ${{ runner.os }}-maven-owasp-cvedb-${{ steps.get-date.outputs.date }}
+        restore-keys: ${{ runner.os }}-maven-owasp-cvedb
 
     - name: Update CVD Database
       env:
@@ -66,12 +73,12 @@ jobs:
       run: |
         mvn -B -P owasp -DnvdApiDelay=6000 --settings maven-ci-settings.xml org.owasp:dependency-check-maven:update-only
 
-    - name: Save CVD Database to Cache
+    - name: Save Cache - CVD Database
       uses: actions/cache/save@v5
       with:
         path: |
           ~/.m2/repository/org/owasp/dependency-check-data
-        key: ${{ runner.os }}-maven-owasp-cvedb
+        key: ${{ runner.os }}-maven-owasp-cvedb-${{ steps.get-date.outputs.date }}
 
     - name: Dependency Vulnerability Check with OWASP
       env:

.github/workflows/maven-build.yml

@@ -18,7 +18,7 @@ jobs:
         # Disabling shallow clone is recommended for improving relevancy of reporting
         fetch-depth: 0
 
-    - name: Cache maven repository
+    - name: Cache -  Maven Repository
       uses: actions/cache@v5
       with:
         path: |
@@ -49,12 +49,19 @@ jobs:
       run: |
         mvn install sonar:sonar -P coverage -Dsonar.projectKey=FraunhoferIOSB_FAAAST-Service --settings maven-ci-settings.xml -B
 
-    - name: Restore CVD Database from Cache
+    - name: Get Date
+      id: get-date
+      run: |
+        echo "date=$(/bin/date -u "+%Y-%m-%dT%H:%M:%S")" >> $GITHUB_OUTPUT
+      shell: bash
+
+    - name: Restore Cache - CVD Database
       uses: actions/cache/restore@v5
       with:
         path: |
           ~/.m2/repository/org/owasp/dependency-check-data
-        key: ${{ runner.os }}-maven-owasp-cvedb
+        key: ${{ runner.os }}-maven-owasp-cvedb-${{ steps.get-date.outputs.date }}
+        restore-keys: ${{ runner.os }}-maven-owasp-cvedb
 
     - name: Update CVD Database
       env:
@@ -64,12 +71,12 @@ jobs:
       run: |
         mvn -B -P owasp -DnvdApiDelay=6000 --settings maven-ci-settings.xml org.owasp:dependency-check-maven:update-only
 
-    - name: Save CVD Database to Cache
+    - name: Save Cache - CVD Database
       uses: actions/cache/save@v5
       with:
         path: |
           ~/.m2/repository/org/owasp/dependency-check-data
-        key: ${{ runner.os }}-maven-owasp-cvedb
+        key: ${{ runner.os }}-maven-owasp-cvedb-${{ steps.get-date.outputs.date }}
 
     - name: Dependency Vulnerability Check with OWASP
       env:

.github/workflows/maven-deploy.yml

@@ -28,7 +28,7 @@ jobs:
     - name: Checkout Source
       uses: actions/checkout@v6
 
-    - name: Cache maven repository
+    - name: Cache - Maven Repository
       uses: actions/cache@v5
       with:
         path: ~/.m2/repository
@@ -59,12 +59,19 @@ jobs:
       run: |
         mvn install -P test --settings maven-ci-settings.xml -B
 
-    - name: Restore CVD Database from Cache
+    - name: Get Date
+      id: get-date
+      run: |
+        echo "date=$(/bin/date -u "+%Y-%m-%dT%H:%M:%S")" >> $GITHUB_OUTPUT
+      shell: bash
+
+    - name: Restore Cache - CVD Database
       uses: actions/cache/restore@v5
       with:
         path: |
           ~/.m2/repository/org/owasp/dependency-check-data
-        key: ${{ runner.os }}-maven-owasp-cvedb
+        key: ${{ runner.os }}-maven-owasp-cvedb-${{ steps.get-date.outputs.date }}
+        restore-keys: ${{ runner.os }}-maven-owasp-cvedb
 
     - name: Update CVD Database
       env:
@@ -74,12 +81,12 @@ jobs:
       run: |
         mvn -B -P owasp -DnvdApiDelay=6000 --settings maven-ci-settings.xml org.owasp:dependency-check-maven:update-only
 
-    - name: Save CVD Database to Cache
+    - name: Save Cache - CVD Database
       uses: actions/cache/save@v5
       with:
         path: |
           ~/.m2/repository/org/owasp/dependency-check-data
-        key: ${{ runner.os }}-maven-owasp-cvedb
+        key: ${{ runner.os }}-maven-owasp-cvedb-${{ steps.get-date.outputs.date }}
 
     - name: Dependency Vulnerability Check with OWASP
       env: