merge main

Signed-off-by: wind57 <[email protected]>

Author: wind57

.github/dependabot.yml

@@ -15,12 +15,12 @@ updates:
     schedule:
       interval: daily
     target-branch: main
-#    ignore:
-#      # only upgrade by minor or patch
-#      - dependency-name: "*"
-#        update-types:
-#          - version-update:semver-major
-#          - version-update:semver-minor
+    ignore:
+      # only upgrade by minor or patch
+      - dependency-name: "*"
+        update-types:
+          - version-update:semver-major
+          - version-update:semver-minor
   - package-ecosystem: maven
     directory: /
     schedule:

.github/workflows/composites/cache/action.yaml

@@ -1,5 +1,10 @@
 name: cache
 description: cache
+inputs:
+  jdk-version:
+    description: 'Java version to use in cache key'
+    required: true
+    default: '17'
 runs:
   using: "composite"
   steps:
@@ -10,6 +15,6 @@ runs:
         action: buildjet/cache@v3
         with: |
           path: ~/.m2/repository
-          key: ${{ runner.os }}-cache-${{ env.BRANCH_NAME }}-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ${{ runner.os }}-cache-${{ env.BRANCH_NAME }}-${{ hashFiles('**/pom.xml') }}
+          key: ${{ runner.os }}-cache-jdk${{ inputs.jdk-version }}-${{ env.BRANCH_NAME }}-${{ hashFiles('**/pom.xml') }}
+          restore-keys: ${{ runner.os }}-cache-jdk${{ inputs.jdk-version }}-${{ env.BRANCH_NAME }}-${{ hashFiles('**/pom.xml') }}
         

.github/workflows/composites/matrix-bounds-on-test-times-cache-hit/action.yaml

@@ -13,6 +13,15 @@
 
 name: matrix bounds on test times cache hit
 description: matrix bounds on test times cache hit
+inputs:
+  jdk-version:
+    description: 'Java version to use in artifact name'
+    required: false
+    default: '17'
+  branch:
+    description: 'Branch name to use in artifact name'
+    required: false
+    default: 'main'
 runs:
   using: "composite"
 
@@ -29,6 +38,12 @@ runs:
       shell: bash
       run: cat /tmp/sorted.txt
 
+    - name: download tests
+      uses: actions/download-artifact@v4
+      with:
+        name: tests-${{ inputs.branch }}-jdk${{ inputs.jdk-version }}.txt
+        path: /tmp/
+
     - name: compute matrix steps
       shell: bash
       run: |
@@ -119,11 +134,11 @@ runs:
     - name: upload test with times
       uses: actions/upload-artifact@v4
       with:
-        name: tests-with-times-sorted.txt
+        name: tests-with-times-sorted-${{ inputs.branch }}-jdk${{ inputs.jdk-version }}.txt
         path: /tmp/tests-with-times-sorted.txt
 
     - name: upload test without times
       uses: actions/upload-artifact@v4
       with:
-        name: tests-without-times.txt
+        name: tests-without-times-${{ inputs.branch }}-jdk${{ inputs.jdk-version }}.txt
         path: /tmp/tests-without-times.txt

.github/workflows/composites/maven-build-with-dry-run-for-tests/action.yaml

@@ -1,5 +1,14 @@
 name: maven-build-with-dry-run-for-tests
 description: maven-build-with-dry-run-for-tests
+inputs:
+  jdk-version:
+    description: 'Java version to use in artifact name'
+    required: false
+    default: '17'
+  branch:
+    description: 'Branch name to use in artifact name'
+    required: false
+    default: 'main'
 runs:
   using: "composite"
   steps:
@@ -34,6 +43,6 @@ runs:
     - name: upload test
       uses: actions/upload-artifact@v4
       with:
-        name: tests.txt
+        name: tests-${{ inputs.branch }}-jdk${{ inputs.jdk-version }}.txt
         path: /tmp/tests.txt
 

.github/workflows/composites/pre-test-actions/action.yaml

@@ -3,6 +3,15 @@
 
 name: pre-test-actions
 description: pre-test-actions
+inputs:
+  jdk-version:
+    description: 'Java version to use in artifact name'
+    required: false
+    default: '17'
+  branch:
+    description: 'Branch name to use in artifact name'
+    required: false
+    default: 'main'
 runs:
   using: "composite"
 
@@ -17,14 +26,16 @@ runs:
 
     - name: cache local maven repository
       uses: ./.github/workflows/composites/cache
+      with:
+        jdk-version: ${{ inputs.jdk-version }}
 
     - name: restore common images
       uses: ./.github/workflows/composites/restore-docker-images
 
     - name: build project
       shell: bash
       run: |
-        ./mvnw clean install -P 'run-on-github-actions' -Dspring-boot.build-image.skip=true -DskipITs -DskipTests -T1C -U -B -q  
+        ./mvnw clean install -Dspring-boot.build-image.skip=true -DskipITs -DskipTests -T1C -U -B -q  
 
     - name: build controllers project
       uses: ./.github/workflows/composites/build-controllers-project
@@ -35,7 +46,7 @@ runs:
     - name: download tests
       uses: actions/download-artifact@v4
       with:
-        name: tests.txt
+        name: tests-${{ inputs.branch }}-jdk${{ inputs.jdk-version }}.txt
         path: /tmp
 
 

.github/workflows/composites/run-and-save-test-times-when-cache-missing/action.yaml

@@ -6,6 +6,15 @@
 
 name: run and save test times when cache missing
 description: run and save test times when cache missing
+inputs:
+  jdk-version:
+    description: 'Java version to use in artifact name'
+    required: false
+    default: '17'
+  branch:
+    description: 'Branch name to use in artifact name'
+    required: false
+    default: 'main'
 runs:
   using: "composite"
 
@@ -70,7 +79,7 @@ runs:
     - name: upload individual tests
       uses: actions/upload-artifact@v4
       with:
-        name: test_times_${{ env.CURRENT_INDEX }}.txt
+        name: test_times_${{ inputs.branch }}_jdk${{ inputs.jdk-version }}_${{ env.CURRENT_INDEX }}.txt
         path: /tmp/test_times_${{ env.CURRENT_INDEX }}.txt
 
 

.github/workflows/composites/run-and-save-test-times-when-cache-present/action.yaml

@@ -1,5 +1,14 @@
 name: run and save test times when cache present
 description: run and save test times when cache present
+inputs:
+  jdk-version:
+    description: 'Java version to use in artifact name'
+    required: false
+    default: '17'
+  branch:
+    description: 'Branch name to use in artifact name'
+    required: false
+    default: 'main'
 runs:
   using: "composite"
 
@@ -8,13 +17,13 @@ runs:
     - name: download tests with times
       uses: actions/download-artifact@v4
       with:
-        name: tests-with-times-sorted.txt
+        name: tests-with-times-sorted-${{ inputs.branch }}-jdk${{ inputs.jdk-version }}.txt
         path: /tmp/
 
     - name: download tests without times
       uses: actions/download-artifact@v4
       with:
-        name: tests-without-times.txt
+        name: tests-without-times-${{ inputs.branch }}-jdk${{ inputs.jdk-version }}.txt
         path: /tmp/
 
     - name: split tests into known times and un-known times
@@ -192,5 +201,5 @@ runs:
     - name: upload individual tests
       uses: actions/upload-artifact@v4
       with:
-        name: test_times_${{ env.CURRENT_INDEX }}.txt
+        name: test_times_${{ inputs.branch }}_jdk${{ inputs.jdk-version }}_${{ env.CURRENT_INDEX }}.txt
         path: /tmp/test_times_${{ env.CURRENT_INDEX }}.txt

.github/workflows/composites/setup-jdk/action.yaml

@@ -0,0 +1,14 @@
+name: setup project with specified jdk
+description: setup project with specified jdk
+inputs:
+  jdk-version:
+    description: 'Java version to use'
+    required: true
+    default: '17'
+runs:
+  using: "composite"
+  steps:
+    - uses: actions/setup-java@v4
+      with:
+        distribution: 'temurin'
+        java-version: ${{ inputs.jdk-version }}

.github/workflows/composites/test-times/action.yaml

@@ -8,6 +8,15 @@
 
 name: test-times
 description: test-times
+inputs:
+  jdk-version:
+    description: 'Java version to use in cache key'
+    required: true
+    default: '17'
+  branch:
+    description: 'Branch name to use in artifact download'
+    required: true
+    default: 'main'
 runs:
   using: "composite"
 
@@ -26,15 +35,20 @@ runs:
     - name: merge all artifacts into a single file and sort by time
       shell: bash
       run: |
-        arr=($(find /tmp/all-artifacts/ -type f -name "test_times*"))
+        # The artifact download creates directories named after the artifact
+        # e.g., /tmp/all-artifacts/test_times_main_jdk17_0.txt/test_times_0.txt
+        # So we need to find files inside directories matching the pattern
+        arr=($(find /tmp/all-artifacts/test_times_${{ inputs.branch }}_jdk${{ inputs.jdk-version }}_* -type f 2>/dev/null || true))
+
+        echo "Found ${#arr[@]} test time files"
 
         for i in "${arr[@]}"; do
           echo "parsing -> ${i}"
           cat "${i}" | awk '{print $3" "$6}' >> /tmp/times-of-all-tests.txt
         done
 
         sort -t' '  -nk2 /tmp/times-of-all-tests.txt >> /tmp/sorted.txt
-        
+
         cat /tmp/sorted.txt
 
     - name: show all tests in a sorted manner
@@ -50,4 +64,4 @@ runs:
       uses: actions/cache/save@v4
       with:
         path: /tmp/sorted.txt
-        key: ${{ runner.os }}-spring-cloud-k8s-existing-test-times-cache-${{ github.run_id }}
+        key: ${{ runner.os }}-spring-cloud-k8s-jdk${{ inputs.jdk-version }}-test-times-cache-${{ github.run_id }}