From 905c4ee15df6a53f9b64872d4151d52504ab06ae Mon Sep 17 00:00:00 2001 From: jamshale Date: Wed, 11 Dec 2024 09:06:53 -0800 Subject: [PATCH 1/2] Remove sonar cov report move step Signed-off-by: jamshale --- .github/workflows/sonar-pr.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/sonar-pr.yml b/.github/workflows/sonar-pr.yml index 5f763e8cc4..05146e4818 100644 --- a/.github/workflows/sonar-pr.yml +++ b/.github/workflows/sonar-pr.yml @@ -51,12 +51,6 @@ jobs: echo base branch = ${{ fromJson(steps.get_pr_data.outputs.data).base.ref }} git checkout -B temp-branch-for-scanning upstream/${{ fromJson(steps.get_pr_data.outputs.data).head.ref }} - - name: Move Coverage Report And Adjust Source - run: | - mkdir test-reports - mv coverage.xml test-reports - # Need to change source in coverage report because it was generated from another context - sed -i 's/\/home\/runner\/work\/acapy\/acapy\//\/github\/workspace\//g' test-reports/coverage.xml - name: SonarCloud Scan uses: SonarSource/sonarqube-scan-action@master env: From a1ebf3d5a94ee40d102591ade173c9d0d7cdb963 Mon Sep 17 00:00:00 2001 From: jamshale Date: Wed, 11 Dec 2024 09:45:51 -0800 Subject: [PATCH 2/2] testing Signed-off-by: jamshale --- .github/workflows/sonar-pr.yml | 13 ++++++++++++- sonar-project.properties | 4 ++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.github/workflows/sonar-pr.yml b/.github/workflows/sonar-pr.yml index 05146e4818..ada7025cd7 100644 --- a/.github/workflows/sonar-pr.yml +++ b/.github/workflows/sonar-pr.yml @@ -9,7 +9,7 @@ on: jobs: SonarCloud: runs-on: ubuntu-latest - if: github.event.workflow_run.conclusion == 'success' && github.repository == 'openwallet-foundation/acapy' + if: github.event.workflow_run.conclusion == 'success' && github.repository == 'jamshale/acapy' steps: - uses: actions/checkout@v4 with: @@ -51,6 +51,17 @@ jobs: echo base branch = ${{ fromJson(steps.get_pr_data.outputs.data).base.ref }} git checkout -B temp-branch-for-scanning upstream/${{ fromJson(steps.get_pr_data.outputs.data).head.ref }} + - name: Move Coverage Report And Adjust Source + run: | + mkdir test-reports + mv coverage.xml test-reports + # Need to change source in coverage report because it was generated from another context + echo ******************************************************************** + echo ${ls} + sed -i 's/\/home\/runner\/work\/acapy\/acapy\//\/github\/workspace\//g' test-reports/coverage.xml + echo ${ls} + echo ${cd test-reports} + echo ${ls} - name: SonarCloud Scan uses: SonarSource/sonarqube-scan-action@master env: diff --git a/sonar-project.properties b/sonar-project.properties index 92843219a7..61e82ad5e3 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -1,5 +1,5 @@ -sonar.projectKey=openwallet-foundation_acapy -sonar.organization=openwallet-foundation +sonar.projectKey=jamshale_acapy +sonar.organization=jamshale sonar.projectName=acapy sonar.python.version=3.12 \ No newline at end of file