From 9e01f8a436d5eb9cd5138933753f719ffc64f9ae Mon Sep 17 00:00:00 2001 From: guruchandru Date: Wed, 6 Dec 2023 16:08:23 +0530 Subject: [PATCH 1/3] Updating push.yml with sonar cloud changes --- .github/workflows/push.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 1176ed13..8721f295 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -80,10 +80,10 @@ jobs: directory: . fail_ci_if_error: true - # - name: Upload SonarCloud - # run: | - # build/sonar-scanner/bin/sonar-scanner -Dsonar.host.url=https://sonarcloud.io -Dproject.settings=.sonar-project.properties -Dsonar.login=${{ secrets.SONAR_TOKEN }} - # env: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Upload SonarCloud + run: | + build/sonar-scanner/bin/sonar-scanner -Dsonar.host.url=https://sonarcloud.io -Dproject.settings=.sonar-project.properties -Dsonar.login=${{ secrets.SONAR_TOKEN }} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 67f972778a7ea9ff5ae41ff693872a2927113348 Mon Sep 17 00:00:00 2001 From: guruchandru Date: Wed, 6 Dec 2023 17:30:24 +0530 Subject: [PATCH 2/3] Adding sonar properties file --- .github/workflows/push.yml | 1 + .sonar-project.properties | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 .sonar-project.properties diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 8721f295..56a0dc89 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -85,5 +85,6 @@ jobs: build/sonar-scanner/bin/sonar-scanner -Dsonar.host.url=https://sonarcloud.io -Dproject.settings=.sonar-project.properties -Dsonar.login=${{ secrets.SONAR_TOKEN }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} diff --git a/.sonar-project.properties b/.sonar-project.properties new file mode 100644 index 00000000..9b389b5d --- /dev/null +++ b/.sonar-project.properties @@ -0,0 +1,33 @@ +# SPDX-FileCopyrightText: 2023 Comcast Cable Communications Management, LLC +# SPDX-License-Identifier: Apache-2.0 + +# Reference: +# https://github.com/SonarSource/sonarcloud_example_go-sqscanner-travis/blob/master/sonar-project.properties + + +# ===================================================== +# Standard properties +# ===================================================== + +sonar.organization=xmidt-org +sonar.projectKey=xmidt-org_webcfg +sonar.projectName=webcfg + +sonar.sources=src + +# ===================================================== +# Meta-data for the project +# ===================================================== + +sonar.links.homepage=https://github.com/xmidt-org/webcfg +sonar.links.ci=https://github.com/xmidt-org/webcfg/actions +sonar.links.scm=https://github.com/xmidt-org/webcfg +sonar.links.issue=https://github.com/xmidt-org/webcfg/issues + +# ===================================================== +# Properties specific to C +# ===================================================== +sonar.cfamily.build-wrapper-output=build/bw-output +sonar.cfamily.threads=2 +sonar.cfamily.cache.enabled=false +sonar.coverageReportPaths=build/coverage.xml From 5ec224e4a4894ad45b56f1c2154df0443ed3850e Mon Sep 17 00:00:00 2001 From: guruchandru Date: Thu, 7 Dec 2023 12:27:28 +0530 Subject: [PATCH 3/3] Updating push.yml sonar binaries --- .github/workflows/push.yml | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 56a0dc89..cb095bd6 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -20,10 +20,10 @@ on: jobs: test: name: Unit Tests - runs-on: [ ubuntu-latest ] + runs-on: [ ubuntu-20.04 ] steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 @@ -32,15 +32,13 @@ jobs: run: | sudo apt update sudo apt-get -y install valgrind libcunit1 libcunit1-doc libcunit1-dev libmsgpack-dev gcovr libtool xsltproc docbook-xsl - pip install codecov + pip install coverage - name: Make Build Directory run: mkdir build - name: Get Sonarcloud Binaries - uses: xmidt-org/sonarcloud-installer-action@v1 - with: - working-directory: build + uses: sonarsource/sonarcloud-github-c-cpp@v2 - name: Get rtrouted Binary working-directory: build @@ -74,17 +72,18 @@ jobs: run: | gcovr --sonarqube coverage.xml -r .. + - name: Upload SonarCloud + run: | + sonar-scanner -Dsonar.host.url=https://sonarcloud.io -Dproject.settings=.sonar-project.properties -Dsonar.login=${{ secrets.SONAR_TOKEN }} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Upload Codecov.io - uses: codecov/codecov-action@v1 + #uses: codecov/codecov-action@v1 + uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # v3.1.4 with: directory: . fail_ci_if_error: true - - name: Upload SonarCloud - run: | - build/sonar-scanner/bin/sonar-scanner -Dsonar.host.url=https://sonarcloud.io -Dproject.settings=.sonar-project.properties -Dsonar.login=${{ secrets.SONAR_TOKEN }} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}