Merge pull request #41 from DataDog/tyler/rename-build.gradle
Rename build.gradle scripts to match project name.
This commit is contained in:
commit
78969ce6f0
|
@ -9,16 +9,16 @@ jobs:
|
||||||
- checkout
|
- checkout
|
||||||
|
|
||||||
- restore_cache:
|
- restore_cache:
|
||||||
key: dd-trace-java-{{ checksum "build.gradle" }}-{{ checksum "dd-java-agent/build.gradle" }}-{{ checksum "dd-trace/build.gradle" }}
|
key: dd-trace-java-{{ checksum "dd-trace-java.gradle" }}-{{ checksum "dd-java-agent/dd-java-agent.gradle" }}-{{ checksum "dd-trace/dd-trace.gradle" }}
|
||||||
|
|
||||||
- run:
|
- run:
|
||||||
name: Run Tests
|
name: Run Tests
|
||||||
command: ./gradlew clean shadowJar check
|
command: ./gradlew clean shadowJar check --parallel
|
||||||
|
|
||||||
- save_cache:
|
- save_cache:
|
||||||
paths:
|
paths:
|
||||||
- ~/.gradle
|
- ~/.gradle
|
||||||
key: dd-trace-java-{{ checksum "build.gradle" }}-{{ checksum "dd-java-agent/build.gradle" }}-{{ checksum "dd-trace/build.gradle" }}
|
key: dd-trace-java-{{ checksum "dd-trace-java.gradle" }}-{{ checksum "dd-java-agent/dd-java-agent.gradle" }}-{{ checksum "dd-trace/dd-trace.gradle" }}
|
||||||
|
|
||||||
- store_test_results:
|
- store_test_results:
|
||||||
path: dd-java-agent/build/test-results
|
path: dd-java-agent/build/test-results
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
rootProject.name = 'dd-trace-java'
|
rootProject.name = 'dd-trace-java'
|
||||||
|
|
||||||
include ':dd-trace'
|
include ':dd-trace'
|
||||||
include ':dd-java-agent'
|
include ':dd-java-agent'
|
||||||
include ':dd-java-agent-ittests'
|
include ':dd-java-agent-ittests'
|
||||||
|
@ -8,11 +9,11 @@ include ':dd-trace-examples:spring-boot-jdbc'
|
||||||
include ':dd-trace-examples'
|
include ':dd-trace-examples'
|
||||||
include ':dd-trace-annotations'
|
include ':dd-trace-annotations'
|
||||||
|
|
||||||
project(':dd-trace').projectDir = "$rootDir/dd-trace" as File
|
def setBuildFile(project) {
|
||||||
project(':dd-java-agent').projectDir = "$rootDir/dd-java-agent" as File
|
project.buildFileName = "${project.name}.gradle"
|
||||||
project(':dd-java-agent-ittests').projectDir = "$rootDir/dd-java-agent-ittests" as File
|
project.children.each {
|
||||||
project(':dd-trace-examples:async-tracing').projectDir = "$rootDir/dd-trace-examples/async-tracing" as File
|
setBuildFile(it)
|
||||||
project(':dd-trace-examples:dropwizard-mongo-client').projectDir = "$rootDir/dd-trace-examples/dropwizard-mongo-client" as File
|
}
|
||||||
project(':dd-trace-examples:spring-boot-jdbc').projectDir = "$rootDir/dd-trace-examples/spring-boot-jdbc" as File
|
}
|
||||||
project(':dd-trace-examples').projectDir = "$rootDir/dd-trace-examples" as File
|
|
||||||
project(':dd-trace-annotations').projectDir = "$rootDir/dd-trace-annotations" as File
|
setBuildFile(rootProject)
|
||||||
|
|
Loading…
Reference in New Issue