From 413e9fb649059e03721701fc8244657a53a60f69 Mon Sep 17 00:00:00 2001
From: guwirth <guenter.wirth@etas.com>
Date: Mon, 22 Jan 2024 16:18:49 +0100
Subject: [PATCH] SonarCloud: Java 11 is no longer supported as scanner runtime
 environment - if push on job level - close #2615

---
 .github/workflows/cxx-ci.yml | 86 +++++++++++++++++++++++++++++++-----
 1 file changed, 76 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/cxx-ci.yml b/.github/workflows/cxx-ci.yml
index 1fb7d56253..8cfbe39b0a 100644
--- a/.github/workflows/cxx-ci.yml
+++ b/.github/workflows/cxx-ci.yml
@@ -134,16 +134,6 @@ jobs:
     - name: Build and test with Maven
       run: mvn -B -e -V install --file pom.xml
 
-    # Update SonarCloud results
-    # - Secrets are not passed to the runner when a workflow is triggered from a forked repository!
-    #
-    - name: Update SonarCloud results
-      if: github.event_name == 'push'
-      run: mvn sonar:sonar -B -e -V -Dsonar.organization=sonaropencommunity -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_TOKEN -Dsonar.python.version=3.8
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-
     # create artifacts from Linux, Java 11 Temurin
     #
     - name: Collect JAR files
@@ -224,6 +214,82 @@ jobs:
       run: mvn -B -e -V verify --file pom.xml
 
 
+  # -----------------------------------------------------------------------------------------------------------
+  # Update SonarCloud results
+  # - Java 11 is no longer supported as scanner runtime environment
+  # -----------------------------------------------------------------------------------------------------------
+  sonar-cloud:
+
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+        java: [ '17' ]
+        distribution: [ 'temurin' ]
+
+    if: github.event_name == 'push'
+    runs-on: ${{ matrix.os }}
+
+    steps:
+
+    # context information
+    #
+    - name: Dump GitHub Context
+      env:
+        GITHUB_CONTEXT: ${{ toJSON(github) }}
+      run: echo "$GITHUB_CONTEXT"
+    - name: Dump Matrix Context
+      env:
+        MATRIX_CONTEXT: ${{ toJSON(matrix) }}
+      run: echo "$MATRIX_CONTEXT"
+
+    # checkout code
+    # - to provide complete SCM information to the sonar scanner,
+    #   all historical data for all branches and tags must be retrieved (fetch-depth: 0)
+    #
+    - name: Checkout repository
+      uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+
+    # setup Java
+    #
+    - name: Set up JDK Java ${{ matrix.java }} | ${{ matrix.distribution }} | ${{ matrix.os }}
+      uses: actions/setup-java@v3
+      with:
+        java-version: ${{ matrix.java }}
+        distribution: ${{ matrix.distribution }}
+        cache: maven
+
+    # read version number from POM
+    #
+    - name: get-pom-version
+      id: pom-version
+      uses: andreacomo/maven-gav-extractor@v2
+
+    # remove -SNAPSHOT from POM version (major.minor.patch-SNAPSHOT)
+    #
+    - run: echo "CXX_POM_VERSION=${{ steps.pom-version.outputs.version }}" >> $GITHUB_ENV
+    - run: echo "CXX_VERSION=${CXX_POM_VERSION%-*}" >> $GITHUB_ENV
+
+    # set version number of plugin JAR
+    # - 'major.minor.patch' and 'build' number from actions run number
+    #
+    - name: Sets the current project's version
+      run: mvn versions:set -DartifactId='cxx' -DnewVersion='${{ env.CXX_VERSION }}.${{ github.run_number }}'
+
+    - name: Dump environment variables
+      run: env
+
+    # Update SonarCloud results
+    # - Secrets are not passed to the runner when a workflow is triggered from a forked repository!
+    #
+    - name: Update SonarCloud results
+      run: mvn sonar:sonar -B -e -V -Dsonar.organization=sonaropencommunity -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_TOKEN -Dsonar.python.version=3.8
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+
+
   # -----------------------------------------------------------------------------------------------------------
   # test cxx plugin with SonarQube (Linux)
   # -----------------------------------------------------------------------------------------------------------