Skip to content

Evergreen: Updated static checks #1172

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

Merged
merged 1 commit into from
Aug 10, 2023
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: 1 addition & 1 deletion .evergreen/.evg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -901,7 +901,7 @@ tasks:
commands:
- func: "exec script"
vars:
file: ".evergreen/compile.sh"
file: ".evergreen/static-checks.sh"

- name: "test"
commands:
Expand Down
2 changes: 1 addition & 1 deletion .evergreen/run-kotlin-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ fi
echo "Running Kotlin tests"

./gradlew -version
./gradlew kCheck -Dorg.mongodb.test.uri=${MONGODB_URI} ${MULTI_MONGOS_URI_SYSTEM_PROPERTY}
./gradlew kotlinCheck -Dorg.mongodb.test.uri=${MONGODB_URI} ${MULTI_MONGOS_URI_SYSTEM_PROPERTY}
2 changes: 1 addition & 1 deletion .evergreen/run-scala-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ fi
echo "Running scala tests with Scala $SCALA"

./gradlew -version
./gradlew -PscalaVersion=$SCALA --stacktrace --info :bson-scala:test :driver-scala:test :driver-scala:integrationTest -Dorg.mongodb.test.uri=${MONGODB_URI} ${MULTI_MONGOS_URI_SYSTEM_PROPERTY}
./gradlew -PscalaVersion=$SCALA --stacktrace --info scalaCheck -Dorg.mongodb.test.uri=${MONGODB_URI} ${MULTI_MONGOS_URI_SYSTEM_PROPERTY}
4 changes: 2 additions & 2 deletions .evergreen/compile.sh → .evergreen/static-checks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ set -o errexit # Exit the script with error if any of the commands fail
RELATIVE_DIR_PATH="$(dirname "${BASH_SOURCE[0]:-$0}")"
. "${RELATIVE_DIR_PATH}/javaConfig.bash"

echo "Compiling java driver"
echo "Compiling JVM drivers"

./gradlew -version
./gradlew -PxmlReports.enabled=true --info -x test -x integrationTest -x spotlessApply clean check jar testClasses docs
./gradlew -PxmlReports.enabled=true --info -x test -x integrationTest -x spotlessApply clean check scalaCheck kotlinCheck jar testClasses docs
2 changes: 1 addition & 1 deletion bson-kotlin/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ spotbugs { showProgress.set(true) }
// ===========================
// Test Configuration
// ===========================
tasks.create("kCheck") {
tasks.create("kotlinCheck") {
description = "Runs all the kotlin checks"
group = "verification"

Expand Down
2 changes: 1 addition & 1 deletion bson-kotlinx/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ spotbugs { showProgress.set(true) }
// ===========================
// Test Configuration
// ===========================
tasks.create("kCheck") {
tasks.create("kotlinCheck") {
description = "Runs all the kotlin checks"
group = "verification"

Expand Down
11 changes: 11 additions & 0 deletions bson-scala/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,17 @@ tasks.withType(Test) {
}
}

// ===================
// Scala checks
// ===================
tasks.register("scalaCheck") {
description = "Runs all the Scala checks"
group = "verification"

dependsOn("clean", "compileTestScala", "check")
tasks.findByName("check").mustRunAfter("clean")
}

ext {
pomName = 'Mongo Scala Bson Library'
}
Expand Down
2 changes: 1 addition & 1 deletion driver-kotlin-coroutine/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ val integrationTest =
classpath = sourceSets["integrationTest"].runtimeClasspath
}

tasks.create("kCheck") {
tasks.create("kotlinCheck") {
description = "Runs all the kotlin checks"
group = "verification"

Expand Down
2 changes: 1 addition & 1 deletion driver-kotlin-sync/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ val integrationTest =
classpath = sourceSets["integrationTest"].runtimeClasspath
}

tasks.create("kCheck") {
tasks.create("kotlinCheck") {
description = "Runs all the kotlin checks"
group = "verification"

Expand Down
12 changes: 12 additions & 0 deletions driver-scala/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,18 @@ task integrationTest(type: Test) {

check.dependsOn integrationTest

// ===================
// Scala checks
// ===================
tasks.register("scalaCheck") {
description = "Runs all the Scala checks"
group = "verification"

dependsOn("clean", "compileTestScala", "compileIntegrationTestScala", "check")
tasks.findByName("check").mustRunAfter("clean")
}


task aggregatedScalaDoc(type: ScalaDoc) {
description('Unified Scaladoc for bson-scala and driver-scala')
group('documentation')
Expand Down