Skip to content

Fix cache key identity for SonarJava #6267

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
guillaume-dequenne merged 1 commit into from
Oct 1, 2026
Merged

Fix cache key identity for SonarJava #6267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions .github/actions/maven-cache/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: Maven Cache
description: Cache Maven dependencies for one job namespace

inputs:
namespace:
description: Job and matrix identity
required: true

runs:
using: composite
steps:
- uses: SonarSource/gh-action_cache@v1
with:
path: ~/.m2/repository
key: maven-${{ runner.os }}-${{ runner.arch }}-${{ inputs.namespace }}-${{ hashFiles('**/pom.xml') }}
restore-keys: |
maven-${{ runner.os }}-${{ runner.arch }}-${{ inputs.namespace }}-
maven-${{ runner.os }}-Build-
23 changes: 0 additions & 23 deletions .github/actions/write-file/action.yml
View file
Open in desktop

This file was deleted.

35 changes: 15 additions & 20 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,17 +87,16 @@ jobs:
JAVA_21_HOME="$(mise where java@21)"
echo "JAVA_HOME=${JAVA_21_HOME}" >> "$GITHUB_ENV"
echo "${JAVA_21_HOME}/bin" >> "$GITHUB_PATH"
- name: Ensure Separate Job Cache Key
uses: ./.github/actions/write-file
- uses: ./.github/actions/maven-cache
with:
file-path: target/just_for_cache_key_calculation/pom.xml
content: ${{ github.job }}-${{ toJSON(matrix.item) }}
namespace: ruling-qa-${{ matrix.item.runner }}-${{ matrix.item.profile }}-${{ matrix.item.sq_version }}
- name: Configure Maven
uses: SonarSource/ci-github-actions/config-maven@v2
with:
artifactory-reader-role: private-reader
use-develocity: ${{ env.USE_DEVELOCITY }}
develocity-url: ${{ env.DEVELOCITY_URL }}
disable-caching: 'true'
- name: Getting Vault Secrets
id: secrets
uses: SonarSource/vault-action-wrapper@v3
Expand Down Expand Up @@ -207,17 +206,16 @@ jobs:
JAVA_21_HOME="$(mise where java@21)"
echo "JAVA_HOME=${JAVA_21_HOME}" >> "$GITHUB_ENV"
echo "${JAVA_21_HOME}/bin" >> "$GITHUB_PATH"
- name: Ensure Separate Job Cache Key
uses: ./.github/actions/write-file
- uses: ./.github/actions/maven-cache
with:
file-path: target/just_for_cache_key_calculation/pom.xml
content: ${{ github.job }}-${{ matrix.sq_version }}
namespace: plugin-qa-${{ matrix.sq_version }}
- name: Configure Maven
uses: SonarSource/ci-github-actions/config-maven@v2
with:
artifactory-reader-role: private-reader
use-develocity: ${{ env.USE_DEVELOCITY }}
develocity-url: ${{ env.DEVELOCITY_URL }}
disable-caching: 'true'
- name: Getting Vault Secrets
id: secrets
uses: SonarSource/vault-action-wrapper@v3
Expand Down Expand Up @@ -257,16 +255,15 @@ 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
- uses: ./.github/actions/maven-cache
with:
file-path: target/just_for_cache_key_calculation/pom.xml
content: ${{ github.job }}
namespace: sanity
- uses: SonarSource/ci-github-actions/config-maven@v2
with:
artifactory-reader-role: private-reader
use-develocity: ${{ env.USE_DEVELOCITY }}
develocity-url: ${{ env.DEVELOCITY_URL }}
disable-caching: 'true'
- name: Compile Test Sources
env:
SONAR_HOST_URL: ${{ fromJSON(steps.secrets.outputs.vault).SONAR_HOST_URL }}
Expand Down Expand Up @@ -340,16 +337,15 @@ 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
- uses: ./.github/actions/maven-cache
with:
file-path: target/just_for_cache_key_calculation/pom.xml
content: ${{ github.job }}
namespace: custom-rules-license-check
- uses: SonarSource/ci-github-actions/config-maven@v2
with:
artifactory-reader-role: private-reader
use-develocity: ${{ env.USE_DEVELOCITY }}
develocity-url: ${{ env.DEVELOCITY_URL }}
disable-caching: 'true'
env:
SONAR_HOST_URL: ${{ fromJSON(steps.secrets.outputs.vault).SONAR_HOST_URL }}
SONAR_TOKEN: ${{ fromJSON(steps.secrets.outputs.vault).SONAR_TOKEN }}
Expand Down Expand Up @@ -384,17 +380,16 @@ jobs:
- uses: jdx/mise-action@c2a87611a18de5b3828c5652fe268e992400cb5c # v4.3.0
with:
version: 2026.9.14
- name: Ensure Separate Job Cache Key
uses: ./.github/actions/write-file
- uses: ./.github/actions/maven-cache
with:
file-path: target/just_for_cache_key_calculation/pom.xml
content: ${{ github.job }}
namespace: qa-os-win
- name: Configure Maven
uses: SonarSource/ci-github-actions/config-maven@v2
with:
artifactory-reader-role: private-reader
use-develocity: ${{ env.USE_DEVELOCITY }}
develocity-url: ${{ env.DEVELOCITY_URL }}
disable-caching: 'true'
- name: Run Maven
env:
JAVA_TOOL_OPTIONS: ""
Expand Down
Loading