From e6c55439339f8e3ba510e99b0d9f2e0fa2500142 Mon Sep 17 00:00:00 2001 From: Philipp Schirmer Date: Thu, 13 Feb 2025 10:07:51 +0100 Subject: [PATCH 1/5] Configure sonar branch analysis --- .github/workflows/java-gradle-base.yaml | 2 +- .github/workflows/java-gradle-docker.yaml | 2 +- .github/workflows/java-gradle-library.yaml | 2 +- .github/workflows/java-gradle-plugin.yaml | 2 +- actions/java-gradle-assess-code-quality/action.yaml | 1 + 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/java-gradle-base.yaml b/.github/workflows/java-gradle-base.yaml index c86a310aa..d945ac244 100644 --- a/.github/workflows/java-gradle-base.yaml +++ b/.github/workflows/java-gradle-base.yaml @@ -104,7 +104,7 @@ jobs: needs: test steps: - name: Assess code quality - uses: bakdata/ci-templates/actions/java-gradle-assess-code-quality@1.61.0 + uses: bakdata/ci-templates/actions/java-gradle-assess-code-quality@feature/sonar-branch-analysis with: download-lfs-files: ${{ inputs.download-lfs-files }} gradle-cache: ${{ inputs.gradle-cache }} diff --git a/.github/workflows/java-gradle-docker.yaml b/.github/workflows/java-gradle-docker.yaml index a2e85c20d..031705202 100644 --- a/.github/workflows/java-gradle-docker.yaml +++ b/.github/workflows/java-gradle-docker.yaml @@ -93,7 +93,7 @@ concurrency: jobs: build-and-test: name: Build, Test and Assess code quality - uses: bakdata/ci-templates/.github/workflows/java-gradle-base.yaml@1.61.0 + uses: bakdata/ci-templates/.github/workflows/java-gradle-base.yaml@feature/sonar-branch-analysis with: java-distribution: ${{ inputs.java-distribution }} java-version: ${{ inputs.java-version }} diff --git a/.github/workflows/java-gradle-library.yaml b/.github/workflows/java-gradle-library.yaml index 7f2ac22c4..34bcd659a 100644 --- a/.github/workflows/java-gradle-library.yaml +++ b/.github/workflows/java-gradle-library.yaml @@ -73,7 +73,7 @@ concurrency: jobs: build-and-test: name: Build, Test and Assess code quality - uses: bakdata/ci-templates/.github/workflows/java-gradle-base.yaml@1.61.0 + uses: bakdata/ci-templates/.github/workflows/java-gradle-base.yaml@feature/sonar-branch-analysis with: java-distribution: ${{ inputs.java-distribution }} java-version: ${{ inputs.java-version }} diff --git a/.github/workflows/java-gradle-plugin.yaml b/.github/workflows/java-gradle-plugin.yaml index feca99317..d7154130c 100644 --- a/.github/workflows/java-gradle-plugin.yaml +++ b/.github/workflows/java-gradle-plugin.yaml @@ -79,7 +79,7 @@ concurrency: jobs: build-and-test: name: Build, Test and Assess code quality - uses: bakdata/ci-templates/.github/workflows/java-gradle-base.yaml@1.61.0 + uses: bakdata/ci-templates/.github/workflows/java-gradle-base.yaml@feature/sonar-branch-analysis with: java-distribution: ${{ inputs.java-distribution }} java-version: ${{ inputs.java-version }} diff --git a/actions/java-gradle-assess-code-quality/action.yaml b/actions/java-gradle-assess-code-quality/action.yaml index 06463c077..aa27f9dee 100644 --- a/actions/java-gradle-assess-code-quality/action.yaml +++ b/actions/java-gradle-assess-code-quality/action.yaml @@ -86,6 +86,7 @@ runs: ${{ (inputs.sonar-organization != '' && format('-Dsonar.organization={0}', inputs.sonar-organization)) || '' }} \ ${{ (inputs.sonar-project-key != '' && format('-Dsonar.projectKey={0}', inputs.sonar-project-key)) || '' }} \ ${{ (inputs.sonar-project-name != '' && format('-Dsonar.projectName={0}', inputs.sonar-project-name)) || '' }} \ + -Dsonar.branch.name=${{ github.ref_name }} \ --info --stacktrace sonar \ ${{ inputs.gradle-refresh-dependencies == 'true' && '--refresh-dependencies' || '' }} shell: bash From 40983595a6619d75b20b227232fdf6cc352c0834 Mon Sep 17 00:00:00 2001 From: Philipp Schirmer Date: Thu, 13 Feb 2025 10:24:10 +0100 Subject: [PATCH 2/5] Configure sonar branch analysis --- actions/java-gradle-assess-code-quality/action.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/actions/java-gradle-assess-code-quality/action.yaml b/actions/java-gradle-assess-code-quality/action.yaml index aa27f9dee..77b2dcd79 100644 --- a/actions/java-gradle-assess-code-quality/action.yaml +++ b/actions/java-gradle-assess-code-quality/action.yaml @@ -81,12 +81,15 @@ runs: - name: Assess code quality if: ${{ inputs.sonar-token != '' }} run: | - ./gradlew -Dsonar.branch.autoconfig.disabled=true \ + ./gradlew \ -Dsonar.host.url=${{ inputs.sonar-host }} \ ${{ (inputs.sonar-organization != '' && format('-Dsonar.organization={0}', inputs.sonar-organization)) || '' }} \ ${{ (inputs.sonar-project-key != '' && format('-Dsonar.projectKey={0}', inputs.sonar-project-key)) || '' }} \ ${{ (inputs.sonar-project-name != '' && format('-Dsonar.projectName={0}', inputs.sonar-project-name)) || '' }} \ - -Dsonar.branch.name=${{ github.ref_name }} \ + ${{ (github.event_name == 'push' && format('-Dsonar.branch.name={0}', github.ref_name)) || '' }} \ + ${{ (github.event_name == 'pull_request' && format('-Dsonar.pullrequest.key={0}', github.event.pull_request.number)) || '' }} \ + ${{ (github.event_name == 'pull_request' && format('-Dsonar.pullrequest.branch={0}', github.ref_name)) || '' }} \ + ${{ (github.event_name == 'pull_request' && format('-Dsonar.pullrequest.base={0}', github.base_ref)) || '' }} \ --info --stacktrace sonar \ ${{ inputs.gradle-refresh-dependencies == 'true' && '--refresh-dependencies' || '' }} shell: bash From f0f28e0f927c18a05f88d0c3123cf8a5f7700c87 Mon Sep 17 00:00:00 2001 From: Philipp Schirmer Date: Thu, 13 Feb 2025 10:33:22 +0100 Subject: [PATCH 3/5] Configure sonar branch analysis --- actions/java-gradle-assess-code-quality/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/actions/java-gradle-assess-code-quality/action.yaml b/actions/java-gradle-assess-code-quality/action.yaml index 77b2dcd79..f7086c913 100644 --- a/actions/java-gradle-assess-code-quality/action.yaml +++ b/actions/java-gradle-assess-code-quality/action.yaml @@ -88,7 +88,7 @@ runs: ${{ (inputs.sonar-project-name != '' && format('-Dsonar.projectName={0}', inputs.sonar-project-name)) || '' }} \ ${{ (github.event_name == 'push' && format('-Dsonar.branch.name={0}', github.ref_name)) || '' }} \ ${{ (github.event_name == 'pull_request' && format('-Dsonar.pullrequest.key={0}', github.event.pull_request.number)) || '' }} \ - ${{ (github.event_name == 'pull_request' && format('-Dsonar.pullrequest.branch={0}', github.ref_name)) || '' }} \ + ${{ (github.event_name == 'pull_request' && format('-Dsonar.pullrequest.branch={0}', github.head_ref)) || '' }} \ ${{ (github.event_name == 'pull_request' && format('-Dsonar.pullrequest.base={0}', github.base_ref)) || '' }} \ --info --stacktrace sonar \ ${{ inputs.gradle-refresh-dependencies == 'true' && '--refresh-dependencies' || '' }} From daf77b2efcdee4ad7dfbb417b7a1d2ea809deb81 Mon Sep 17 00:00:00 2001 From: Philipp Schirmer Date: Thu, 13 Feb 2025 10:49:50 +0100 Subject: [PATCH 4/5] Configure sonar branch analysis --- actions/java-gradle-assess-code-quality/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/actions/java-gradle-assess-code-quality/action.yaml b/actions/java-gradle-assess-code-quality/action.yaml index f7086c913..38de7c845 100644 --- a/actions/java-gradle-assess-code-quality/action.yaml +++ b/actions/java-gradle-assess-code-quality/action.yaml @@ -86,7 +86,7 @@ runs: ${{ (inputs.sonar-organization != '' && format('-Dsonar.organization={0}', inputs.sonar-organization)) || '' }} \ ${{ (inputs.sonar-project-key != '' && format('-Dsonar.projectKey={0}', inputs.sonar-project-key)) || '' }} \ ${{ (inputs.sonar-project-name != '' && format('-Dsonar.projectName={0}', inputs.sonar-project-name)) || '' }} \ - ${{ (github.event_name == 'push' && format('-Dsonar.branch.name={0}', github.ref_name)) || '' }} \ + ${{ (github.event_name == 'push' && github.ref_type != 'tag' && format('-Dsonar.branch.name={0}', github.ref_name)) || '' }} \ ${{ (github.event_name == 'pull_request' && format('-Dsonar.pullrequest.key={0}', github.event.pull_request.number)) || '' }} \ ${{ (github.event_name == 'pull_request' && format('-Dsonar.pullrequest.branch={0}', github.head_ref)) || '' }} \ ${{ (github.event_name == 'pull_request' && format('-Dsonar.pullrequest.base={0}', github.base_ref)) || '' }} \ From 9455dc701f30ead15fafbe6a00f658fc8acea0db Mon Sep 17 00:00:00 2001 From: Philipp Schirmer Date: Thu, 13 Feb 2025 11:04:05 +0100 Subject: [PATCH 5/5] Configure sonar branch analysis --- .github/workflows/java-gradle-base.yaml | 2 +- .github/workflows/java-gradle-docker.yaml | 2 +- .github/workflows/java-gradle-library.yaml | 2 +- .github/workflows/java-gradle-plugin.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/java-gradle-base.yaml b/.github/workflows/java-gradle-base.yaml index d945ac244..3339b508f 100644 --- a/.github/workflows/java-gradle-base.yaml +++ b/.github/workflows/java-gradle-base.yaml @@ -104,7 +104,7 @@ jobs: needs: test steps: - name: Assess code quality - uses: bakdata/ci-templates/actions/java-gradle-assess-code-quality@feature/sonar-branch-analysis + uses: bakdata/ci-templates/actions/java-gradle-assess-code-quality@1.62.0 with: download-lfs-files: ${{ inputs.download-lfs-files }} gradle-cache: ${{ inputs.gradle-cache }} diff --git a/.github/workflows/java-gradle-docker.yaml b/.github/workflows/java-gradle-docker.yaml index 031705202..4d316ce5b 100644 --- a/.github/workflows/java-gradle-docker.yaml +++ b/.github/workflows/java-gradle-docker.yaml @@ -93,7 +93,7 @@ concurrency: jobs: build-and-test: name: Build, Test and Assess code quality - uses: bakdata/ci-templates/.github/workflows/java-gradle-base.yaml@feature/sonar-branch-analysis + uses: bakdata/ci-templates/.github/workflows/java-gradle-base.yaml@1.62.0 with: java-distribution: ${{ inputs.java-distribution }} java-version: ${{ inputs.java-version }} diff --git a/.github/workflows/java-gradle-library.yaml b/.github/workflows/java-gradle-library.yaml index 34bcd659a..4b2d2198c 100644 --- a/.github/workflows/java-gradle-library.yaml +++ b/.github/workflows/java-gradle-library.yaml @@ -73,7 +73,7 @@ concurrency: jobs: build-and-test: name: Build, Test and Assess code quality - uses: bakdata/ci-templates/.github/workflows/java-gradle-base.yaml@feature/sonar-branch-analysis + uses: bakdata/ci-templates/.github/workflows/java-gradle-base.yaml@1.62.0 with: java-distribution: ${{ inputs.java-distribution }} java-version: ${{ inputs.java-version }} diff --git a/.github/workflows/java-gradle-plugin.yaml b/.github/workflows/java-gradle-plugin.yaml index d7154130c..de2a7a9fd 100644 --- a/.github/workflows/java-gradle-plugin.yaml +++ b/.github/workflows/java-gradle-plugin.yaml @@ -79,7 +79,7 @@ concurrency: jobs: build-and-test: name: Build, Test and Assess code quality - uses: bakdata/ci-templates/.github/workflows/java-gradle-base.yaml@feature/sonar-branch-analysis + uses: bakdata/ci-templates/.github/workflows/java-gradle-base.yaml@1.62.0 with: java-distribution: ${{ inputs.java-distribution }} java-version: ${{ inputs.java-version }}