From 5ee86c3f91bb4efc522b94036146152ee22b4b37 Mon Sep 17 00:00:00 2001 From: Faye Date: Wed, 23 Oct 2024 14:16:53 +0200 Subject: [PATCH 1/3] Update yml file --- .github/workflows/main.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f9d73fe..9173eb2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -2,14 +2,9 @@ name: Main on: push: - branches: - - main pull_request: types: [opened] -env: - KOSLI_FLOW: sonarcloud-new-project-test - KOSLI_TRAIL: ${{ github.sha }} jobs: sonarcloud: @@ -26,5 +21,5 @@ jobs: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} with: args: > - -Dsonar.analysis.kosli_flow=${{ env.KOSLI_FLOW }} - -Dsonar.analysis.kosli_trail=${{ env.KOSLI_TRAIL }} + -sonar.branch.name=main + -sonar.branch.target=main From 115009157589c473559297547ecacbd4321c3499 Mon Sep 17 00:00:00 2001 From: Faye Date: Wed, 23 Oct 2024 14:19:53 +0200 Subject: [PATCH 2/3] Update sonar properties file --- .github/workflows/main.yml | 4 ---- sonar-project.properties | 4 +++- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9173eb2..8be60bc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,7 +19,3 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - with: - args: > - -sonar.branch.name=main - -sonar.branch.target=main diff --git a/sonar-project.properties b/sonar-project.properties index a666361..7fd84e1 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -1,2 +1,4 @@ sonar.projectKey=FayeSGW_Rock-Paper-Scissors-Lizard-Spock -sonar.organization=fayesgw \ No newline at end of file +sonar.organization=fayesgw +sonar.branch.name=main +sonar.branch.target=main \ No newline at end of file From 12ef4c20d3f640b2b6c5ce7d99bb06ff9e1e2f70 Mon Sep 17 00:00:00 2001 From: Faye Date: Wed, 23 Oct 2024 14:21:11 +0200 Subject: [PATCH 3/3] Remove branch target from sonar properties file --- sonar-project.properties | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sonar-project.properties b/sonar-project.properties index 7fd84e1..91fcdbd 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -1,4 +1,3 @@ sonar.projectKey=FayeSGW_Rock-Paper-Scissors-Lizard-Spock sonar.organization=fayesgw -sonar.branch.name=main -sonar.branch.target=main \ No newline at end of file +sonar.branch.name=main \ No newline at end of file