Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(build): remove CI-triggered sonar job #292

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,13 @@ jobs:
secret-presence:
runs-on: ubuntu-latest
outputs:
SONAR_TOKEN: ${{ steps.secret-presence.outputs.SONAR_TOKEN }}
GPG_PRIVATE_KEY: ${{ steps.secret-presence.outputs.GPG_PRIVATE_KEY }}
GPG_PASSPHRASE: ${{ steps.secret-presence.outputs.GPG_PASSPHRASE }}
DOCKER_HUB_TOKEN: ${{ steps.secret-presence.outputs.DOCKER_HUB_TOKEN }}
steps:
- name: Check whether secrets exist
id: secret-presence
run: |
[ ! -z "${{ secrets.SONAR_TOKEN }}" ] && echo "SONAR_TOKEN=true" >> $GITHUB_OUTPUT
[ ! -z "${{ secrets.GPG_PRIVATE_KEY }}" ] && echo "GPG_PRIVATE_KEY=true" >> $GITHUB_OUTPUT
[ ! -z "${{ secrets.GPG_PASSPHRASE }}" ] && echo "GPG_PASSPHRASE=true" >> $GITHUB_OUTPUT
[ ! -z "${{ secrets.DOCKER_HUB_TOKEN }}" ] && echo "DOCKER_HUB_TOKEN=true" >> $GITHUB_OUTPUT
Expand Down
44 changes: 0 additions & 44 deletions .github/workflows/verify.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,6 @@ concurrency:
cancel-in-progress: true

jobs:
secret-presence:
runs-on: ubuntu-latest
outputs:
SONAR_TOKEN: ${{ steps.secret-presence.outputs.SONAR_TOKEN }}
steps:
- name: Check whether secrets exist
id: secret-presence
run: |
[ ! -z "${{ secrets.SONAR_TOKEN }}" ] && echo "SONAR_TOKEN=true" >> $GITHUB_OUTPUT
exit 0

verify-formatting:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -124,37 +114,3 @@ jobs:

- name: Run E2E tests
run: ./gradlew :edc-tests:runtime:build test -DincludeTags="EndToEndTest"

sonar:
needs: [ secret-presence, verify-formatting ]
if: |
needs.secret-presence.outputs.SONAR_TOKEN
runs-on: ubuntu-latest
steps:
# Set-Up
- uses: actions/checkout@v3.5.2
with:
fetch-depth: 0
- uses: ./.github/actions/setup-java
- name: Cache SonarCloud packages
uses: actions/cache@v3
with:
path: ~/.sonar/cache
key: ${{ runner.os }}-sonar
restore-keys: ${{ runner.os }}-sonar
# Analyse
- name: Build with Maven and analyze with Sonar
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
JACOCO: true
run: |-
./gradlew sonar \
-Pcoverage,failsafe \
-Dsonar.projectKey=${{ vars.SONAR_PROJECT_KEY }} \
-Dsonar.organization=${{ vars.SONAR_ORGANIZATION }} \
-Dsonar.host.url=https://sonarcloud.io \
-Dsonar.coverage.jacoco.xmlReportPaths=${GITHUB_WORKSPACE}/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml \
-Dsonar.verbose=true


13 changes: 0 additions & 13 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ plugins {
id("com.diffplug.spotless") version "6.18.0"
id("com.github.johnrengelman.shadow") version "8.1.1"
id("com.bmuschko.docker-remote-api") version "9.3.1"
id("org.sonarqube") version "4.0.0.2929"
}

val javaVersion: String by project
Expand Down Expand Up @@ -37,15 +36,9 @@ project.subprojects.forEach {
}
}

// make sure the test report aggregation is done before reporting to sonar
tasks.sonar {
dependsOn(tasks.named<JacocoReport>("testCodeCoverageReport"))
}

allprojects {
apply(plugin = "org.eclipse.edc.edc-build")
apply(plugin = "io.freefair.lombok")
apply(plugin = "org.sonarqube")

repositories {
mavenCentral()
Expand Down Expand Up @@ -161,10 +154,4 @@ subprojects {
dockerTask.dependsOn(tasks.findByName(ShadowJavaPlugin.SHADOW_JAR_TASK_NAME))
}
}

sonarqube {
properties {
property("sonar.moduleKey", "${project.group}-${project.name}")
}
}
}