From 967c3e2ea7fd408e939eab98559a9cba39179a39 Mon Sep 17 00:00:00 2001
From: Jonah Jeleniewski <jjeleniewski@integradev.com.au>
Date: Fri, 11 Apr 2025 12:00:03 +1000
Subject: [PATCH 1/2] Add `ORCHESTRATOR_SONAR_VERSION` override for integration
 tests

---
 .github/workflows/build.yml | 7 ++++++-
 .github/workflows/sonar.yml | 2 ++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5cb5916af..e3da09ee1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -27,7 +27,12 @@ jobs:
           distribution: 'temurin'
           cache: maven
       - name: Maven Install
-        run: mvn clean install -Pci --batch-mode --no-transfer-progress
+        env:
+          ORCHESTRATOR_SONAR_VERSION: ${{ vars.ORCHESTRATOR_SONAR_VERSION || 'LATEST_RELEASE' }}
+        run: >
+          mvn clean install
+          -Dsonar.runtimeVersion=$ORCHESTRATOR_SONAR_VERSION
+          -Pci --batch-mode --no-transfer-progress
       - name: Upload plugin jar
         uses: actions/upload-artifact@v4
         with:
diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml
index 4db8fc6e5..8f2a41f66 100644
--- a/.github/workflows/sonar.yml
+++ b/.github/workflows/sonar.yml
@@ -28,7 +28,9 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+          ORCHESTRATOR_SONAR_VERSION: ${{ vars.ORCHESTRATOR_SONAR_VERSION || 'LATEST_RELEASE' }}
         run: >
           mvn clean install -Pci
+          -Dsonar.runtimeVersion=$ORCHESTRATOR_SONAR_VERSION
           org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=integrated-application-development_sonar-delphi
           --batch-mode --no-transfer-progress

From aa5718d0795ce4e2d4aef16ab9cf589996fe0e61 Mon Sep 17 00:00:00 2001
From: Jonah Jeleniewski <jjeleniewski@integradev.com.au>
Date: Fri, 11 Apr 2025 12:08:08 +1000
Subject: [PATCH 2/2] Remove `.git*` from ignored paths in the `build` workflow

---
 .github/workflows/build.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e3da09ee1..df3d24235 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -11,7 +11,6 @@ on:
       - '**.png'
       - 'LICENSE.txt'
       - 'NOTICE.txt'
-      - '.git*'
 
 jobs:
   install: