From bac224ac0ff382ac0334dfa9779a75912c570b20 Mon Sep 17 00:00:00 2001 From: Tomasz Tylenda Date: Mon, 13 Apr 2026 15:39:11 +0200 Subject: [PATCH 1/3] Ensure ITs jobs do not share cache --- .github/actions/write-file/action.yml | 23 ++++++++++++++++++++ .github/workflows/build.yml | 30 +++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 .github/actions/write-file/action.yml diff --git a/.github/actions/write-file/action.yml b/.github/actions/write-file/action.yml new file mode 100644 index 00000000000..ab7b9215d62 --- /dev/null +++ b/.github/actions/write-file/action.yml @@ -0,0 +1,23 @@ +name: Write File +description: Writes a file with the given content + +inputs: + file-path: + description: 'Path to the file to write.' + required: true + content: + description: 'Content to write to the file.' + required: true + +runs: + using: composite + steps: + - name: Write Content to File + shell: bash + env: + FILE_PATH: ${{ inputs.file-path }} + CONTENT: ${{ inputs.content }} + run: | + mkdir -p "$(dirname "$FILE_PATH")" + echo "$CONTENT" > "$FILE_PATH" + echo "$CONTENT" diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9ea14d83cc5..63e21fe98fd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -79,6 +79,11 @@ jobs: version: 2025.7.12 - name: Select Java Version run: mise use java@21 + - name: Ensure Separate Job Cache Key + uses: ./.github/actions/write-file + with: + file-path: just_for_cache_key_calculation/pom.xml + content: ${{ github.job }}-${{ toJSON(matrix.item) }} - name: Configure Maven uses: SonarSource/ci-github-actions/config-maven@v1 with: @@ -141,6 +146,11 @@ jobs: version: 2025.7.12 - name: Select Java Version run: mise use java@21 + - name: Ensure Separate Job Cache Key + uses: ./.github/actions/write-file + with: + file-path: just_for_cache_key_calculation/pom.xml + content: ${{ github.job }}-${{ matrix.sq_version }} - name: Configure Maven uses: SonarSource/ci-github-actions/config-maven@v1 with: @@ -186,6 +196,11 @@ jobs: secrets: | development/kv/data/next url | SONAR_HOST_URL; development/kv/data/next token | SONAR_TOKEN; + - name: Ensure Separate Job Cache Key + uses: ./.github/actions/write-file + with: + file-path: just_for_cache_key_calculation/pom.xml + content: ${{ github.job }} - uses: SonarSource/ci-github-actions/config-maven@v1 with: artifactory-reader-role: private-reader @@ -263,6 +278,11 @@ jobs: secrets: | development/kv/data/next url | SONAR_HOST_URL; development/kv/data/next token | SONAR_TOKEN; + - name: Ensure Separate Job Cache Key + uses: ./.github/actions/write-file + with: + file-path: just_for_cache_key_calculation/pom.xml + content: ${{ github.job }} - uses: SonarSource/ci-github-actions/config-maven@v1 with: artifactory-reader-role: private-reader @@ -315,6 +335,11 @@ jobs: development/kv/data/next url | SONAR_HOST_URL; development/kv/data/next token | SONAR_TOKEN; development/github/token/licenses-ro token | GITHUB_TOKEN; + - name: Ensure Separate Job Cache Key + uses: ./.github/actions/write-file + with: + file-path: just_for_cache_key_calculation/pom.xml + content: ${{ github.job }} - uses: SonarSource/ci-github-actions/config-maven@v1 with: artifactory-reader-role: private-reader @@ -369,6 +394,11 @@ jobs: - uses: jdx/mise-action@5ac50f778e26fac95da98d50503682459e86d566 # v3.2.0 with: version: 2025.7.12 + - name: Ensure Separate Job Cache Key + uses: ./.github/actions/write-file + with: + file-path: just_for_cache_key_calculation/pom.xml + content: ${{ github.job }} - name: Configure Maven uses: SonarSource/ci-github-actions/config-maven@v1 with: From 863e0b129305d9f5e367af2ee27c7c572e2f5117 Mon Sep 17 00:00:00 2001 From: Tomasz Tylenda Date: Thu, 16 Apr 2026 14:55:43 +0200 Subject: [PATCH 2/3] put pom.xml's in target/ --- .github/workflows/build.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 63e21fe98fd..86d4cfdb4a8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -82,7 +82,7 @@ jobs: - name: Ensure Separate Job Cache Key uses: ./.github/actions/write-file with: - file-path: just_for_cache_key_calculation/pom.xml + file-path: target/just_for_cache_key_calculation/pom.xml content: ${{ github.job }}-${{ toJSON(matrix.item) }} - name: Configure Maven uses: SonarSource/ci-github-actions/config-maven@v1 @@ -149,7 +149,7 @@ jobs: - name: Ensure Separate Job Cache Key uses: ./.github/actions/write-file with: - file-path: just_for_cache_key_calculation/pom.xml + file-path: target/just_for_cache_key_calculation/pom.xml content: ${{ github.job }}-${{ matrix.sq_version }} - name: Configure Maven uses: SonarSource/ci-github-actions/config-maven@v1 @@ -199,7 +199,7 @@ jobs: - name: Ensure Separate Job Cache Key uses: ./.github/actions/write-file with: - file-path: just_for_cache_key_calculation/pom.xml + file-path: target/just_for_cache_key_calculation/pom.xml content: ${{ github.job }} - uses: SonarSource/ci-github-actions/config-maven@v1 with: @@ -281,7 +281,7 @@ jobs: - name: Ensure Separate Job Cache Key uses: ./.github/actions/write-file with: - file-path: just_for_cache_key_calculation/pom.xml + file-path: target/just_for_cache_key_calculation/pom.xml content: ${{ github.job }} - uses: SonarSource/ci-github-actions/config-maven@v1 with: @@ -338,7 +338,7 @@ jobs: - name: Ensure Separate Job Cache Key uses: ./.github/actions/write-file with: - file-path: just_for_cache_key_calculation/pom.xml + file-path: target/just_for_cache_key_calculation/pom.xml content: ${{ github.job }} - uses: SonarSource/ci-github-actions/config-maven@v1 with: @@ -397,7 +397,7 @@ jobs: - name: Ensure Separate Job Cache Key uses: ./.github/actions/write-file with: - file-path: just_for_cache_key_calculation/pom.xml + file-path: target/just_for_cache_key_calculation/pom.xml content: ${{ github.job }} - name: Configure Maven uses: SonarSource/ci-github-actions/config-maven@v1 From 3dbf8483f3d1dab172b8025bcddccae681c30052 Mon Sep 17 00:00:00 2001 From: Tomasz Tylenda Date: Thu, 16 Apr 2026 15:03:56 +0200 Subject: [PATCH 3/3] Trigger CI