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

Sonar cloud build failure #7739

Merged
merged 11 commits into from
Oct 7, 2024
2 changes: 1 addition & 1 deletion .github/workflows/sonarcloud.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ jobs:
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
SONAR_ORGANIZATION: ${{ vars.SONAR_ORGANIZATION }}
SONAR_PROJECT_KEY: ${{ vars.SONAR_PROJECT_KEY }}
run: ./gradlew build sonarqube --continue --info -Dorg.gradle.parallel=true -Dorg.gradle.caching=true
run: ./gradlew build sonar --continue -Dorg.gradle.parallel=true -Dorg.gradle.caching=true
20 changes: 5 additions & 15 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ plugins {
id 'me.champeau.jmh' version '0.7.2' apply false
id 'net.ltgt.errorprone' version '4.0.1'
id 'maven-publish'
id 'jacoco'
id 'jacoco-report-aggregation'
id 'org.sonarqube' version '5.1.0.4882'
}

Expand All @@ -40,12 +42,12 @@ sonarqube {
property "sonar.organization", "$System.env.SONAR_ORGANIZATION"
property "sonar.gradle.skipCompile", "true"
property "sonar.host.url", "https://sonarcloud.io"
property "sonar.coverage.jacoco.xmlReportPaths", "${buildDir}/reports/jacoco/jacocoRootReport/jacocoRootReport.xml"
property "sonar.coverage.jacoco.xmlReportPaths", "${buildDir}/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml"
property "sonar.coverage.exclusions", "acceptance-tests/**/*"
}
}

project.tasks["sonarqube"].dependsOn "jacocoRootReport"
project.tasks["sonar"].dependsOn "testCodeCoverageReport"

if (!JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_21)) {
throw new GradleException("Java 21 or later is required to build Besu.\n" +
Expand Down Expand Up @@ -360,6 +362,7 @@ allprojects {
}
}
useJUnitPlatform {}
finalizedBy jacocoTestReport // report is always generated after tests run
}

javadoc {
Expand Down Expand Up @@ -962,19 +965,6 @@ jacocoTestReport {
}
}

task jacocoRootReport(type: org.gradle.testing.jacoco.tasks.JacocoReport) {
additionalSourceDirs.from files(subprojects.sourceSets.main.allSource.srcDirs)
sourceDirectories.from files(subprojects.sourceSets.main.allSource.srcDirs)
classDirectories.from files(subprojects.sourceSets.main.output).asFileTree.matching { exclude 'org/hyperledger/besu/tests/acceptance/**' }
executionData.from fileTree(dir: '.', includes: ['**/jacoco/*.exec'])
reports {
xml.required = true
csv.required = true
html.destination file("build/reports/jacocoHtml")
}
onlyIf = { true }
}

// http://label-schema.org/rc1/
// using the RFC3339 format "2016-04-12T23:20:50.52Z"
def buildTime() {
Expand Down
61 changes: 32 additions & 29 deletions ethereum/api/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -130,41 +130,44 @@ artifacts { testSupportArtifacts testSupportJar }

tasks.register('generateTestBlockchain') {
def srcFiles = 'src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/chain-data'
def dataPath = "$buildDir/generated/data"
def dataPath = new File("$buildDir/generated/data")
def blocksBin = "$buildDir/resources/test/org/hyperledger/besu/ethereum/api/jsonrpc/trace/chain-data/blocks.bin"
inputs.dir(srcFiles)
outputs.file(blocksBin)
dependsOn(configurations.testResourceGeneration)
dependsOn(processTestResources)
doLast {
mkdir(dataPath)
javaexec {
main = 'org.hyperledger.besu.Besu'
classpath = configurations.testResourceGeneration
args = [
"--logging=ERROR",
"--data-path=$dataPath",
"--genesis-file=$srcFiles/genesis.json",
"blocks",
"import",
"--format=JSON",
"--from=$srcFiles/blocks.json",
"--start-time=1438269971"
]
}
javaexec {
main = 'org.hyperledger.besu.Besu'
classpath = configurations.testResourceGeneration
args = [
"--logging=ERROR",
"--data-path=$dataPath",
"--genesis-file=$srcFiles/genesis.json",
"blocks",
"export",
"--format=RLP",
"--start-block=0",
"--to=$blocksBin"
]
if(!dataPath.exists()) {
mkdir(dataPath)

javaexec {
main = 'org.hyperledger.besu.Besu'
classpath = configurations.testResourceGeneration
args = [
"--logging=ERROR",
"--data-path=$dataPath",
"--genesis-file=$srcFiles/genesis.json",
"blocks",
"import",
"--format=JSON",
"--from=$srcFiles/blocks.json",
"--start-time=1438269971"
]
}
javaexec {
main = 'org.hyperledger.besu.Besu'
classpath = configurations.testResourceGeneration
args = [
"--logging=ERROR",
"--data-path=$dataPath",
"--genesis-file=$srcFiles/genesis.json",
"blocks",
"export",
"--format=RLP",
"--start-block=0",
"--to=$blocksBin"
]
}
}
}
}
Expand Down
4 changes: 4 additions & 0 deletions testutil/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ jar {
}
}

sonarqube {
skipProject = true
}

dependencies {
implementation project(':ethereum:eth')
implementation project(':plugin-api')
Expand Down
Loading