From e6ec89e400103b39753cfe8e338c18b323c2f207 Mon Sep 17 00:00:00 2001
From: Jakob Frank <jakob.frank@redlink.at>
Date: Thu, 12 Sep 2024 11:58:40 +0200
Subject: [PATCH] enable matrix-build to test more versions of solr

---
 .github/workflows/maven-build-and-deploy.yaml | 6 ++++--
 .github/workflows/maven-build-and-test.yml    | 7 +++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/maven-build-and-deploy.yaml b/.github/workflows/maven-build-and-deploy.yaml
index 90cdf7b..b28ba07 100644
--- a/.github/workflows/maven-build-and-deploy.yaml
+++ b/.github/workflows/maven-build-and-deploy.yaml
@@ -37,13 +37,15 @@ jobs:
       matrix:
         solr:
           - 9.0.0
-          - 9.1.1
           - 9.2.1
           - 9.3.0
           - 9.4.1
           - 9.5.0
           - 9.6.1
           - 9.7.0
+        include:
+          - solr: 9.7.0
+            sonar: enabled
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -61,7 +63,7 @@ jobs:
           -Dsolr.version=${{matrix.solr}}
           -Psonarcloud
           -Dsonar.projectKey=redlink-gmbh_solr-advanced-suggester
-          -Dsonar.skip=${{ github.actor == 'dependabot[bot]' }}
+          -Dsonar.skip=${{ github.actor == 'dependabot[bot]' || matrix.sonar != 'enabled' }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
diff --git a/.github/workflows/maven-build-and-test.yml b/.github/workflows/maven-build-and-test.yml
index 1266222..59c271e 100644
--- a/.github/workflows/maven-build-and-test.yml
+++ b/.github/workflows/maven-build-and-test.yml
@@ -21,12 +21,15 @@ jobs:
       matrix:
         solr:
           - 9.0.0
-          - 9.1.1
           - 9.2.1
           - 9.3.0
           - 9.4.1
           - 9.5.0
           - 9.6.1
+          - 9.7.0
+        include:
+          - solr: 9.7.0
+            sonar: enabled
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -44,7 +47,7 @@ jobs:
           -Dsolr.version=${{matrix.solr}}
           -Psonarcloud
           -Dsonar.projectKey=redlink-gmbh_solr-advanced-suggester
-          -Dsonar.skip=${{ github.actor == 'dependabot[bot]' }}
+          -Dsonar.skip=${{ github.actor == 'dependabot[bot]' || matrix.sonar != 'enabled' }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}