From 261f8e1657cdcacde163dfd6d67871e1a049bd09 Mon Sep 17 00:00:00 2001
From: Tomasz Tylenda <tomasz.tylenda@sonarsource.com>
Date: Fri, 10 Apr 2026 15:40:57 +0200
Subject: [PATCH 1/2] Use orchestrator-cache in autoscan tests

---
 .github/workflows/build.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c696aa8924..4b7a8d76be 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -299,6 +299,7 @@ jobs:
       contents: write
     env:
       BUILD_NUMBER: ${{ needs.build.outputs.build-number }}
+      SQ_VERSION: LATEST_RELEASE
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
       # For now, the autoscan job need to execute two mvn commands:
@@ -328,6 +329,10 @@ jobs:
           mvn clean compile test-compile --batch-mode
       - name: Select Java 21
         run: mise use java@21
+      - name: Orchestrator Cache
+        uses: ./.github/actions/orchestrator-cache
+        with:
+          sq-version: ${{ env.SQ_VERSION }}
       - name: Run autoscan tests
         env:
           SONAR_HOST_URL: ${{ fromJSON(steps.secrets.outputs.vault).SONAR_HOST_URL }}
@@ -337,7 +342,7 @@ jobs:
         run: >
           mvn clean package --batch-mode --errors --show-version
           --activate-profiles it-autoscan
-          -Dsonar.runtimeVersion=LATEST_RELEASE
+          "-Dsonar.runtimeVersion=$SQ_VERSION"
           -Dmaven.test.redirectTestOutputToFile=false
           -Dparallel=methods
           -DuseUnlimitedThreads=true

From db2cd625ece47f47d3d2267bcb2d0f32042341c5 Mon Sep 17 00:00:00 2001
From: tomasz-tylenda-sonarsource <tomasz.tylenda@sonarsource.com>
Date: Fri, 10 Apr 2026 17:30:57 +0200
Subject: [PATCH 2/2] Update .github/workflows/build.yml

Co-authored-by: Dorian Burihabwa <75226315+dorian-burihabwa-sonarsource@users.noreply.github.com>
---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4b7a8d76be..9ea14d83cc 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -342,7 +342,7 @@ jobs:
         run: >
           mvn clean package --batch-mode --errors --show-version
           --activate-profiles it-autoscan
-          "-Dsonar.runtimeVersion=$SQ_VERSION"
+          -Dsonar.runtimeVersion="$SQ_VERSION"
           -Dmaven.test.redirectTestOutputToFile=false
           -Dparallel=methods
           -DuseUnlimitedThreads=true