Skip to content

Commit e77b8dd

Browse files
authored
Merge pull request #22 from DataDog/tyler/circle-ci
Add circleci config file
2 parents 9582b24 + b9690f9 commit e77b8dd

File tree

6 files changed

+62
-9
lines changed

6 files changed

+62
-9
lines changed

.cirleci/config.yml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
version: 2
2+
jobs:
3+
build:
4+
5+
working_directory: ~/dd-trace-java
6+
7+
docker:
8+
- image: circleci/openjdk:8-jdk
9+
10+
steps:
11+
12+
- checkout
13+
14+
- restore_cache:
15+
key: 'dd-trace-java-{{ checksum "pom.xml" }}-{{ checksum "dd-java-agent/pom.xml" }}-{{ checksum "dd-trace/pom.xml" }}'
16+
17+
- run: mvn -q install -DskipTests dependency:go-offline
18+
19+
- save_cache:
20+
paths:
21+
- ~/.m2
22+
key: 'dd-trace-java-{{ checksum "pom.xml" }}-{{ checksum "dd-java-agent/pom.xml" }}-{{ checksum "dd-trace/pom.xml" }}'
23+
24+
- run: mvn package
25+
26+
- store_test_results:
27+
path: dd-java-agent/target/surefire-reports
28+
- store_test_results:
29+
path: dd-java-agent-ittests/target/surefire-reports
30+
- store_test_results:
31+
path: dd-trace/target/surefire-reports
32+
33+
- store_artifacts:
34+
path: dd-java-agent/target/dd-java-agent.jar

circle.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
2+
machine:
3+
java:
4+
version: openjdk8
5+
6+
dependencies:
7+
override:
8+
- mvn --fail-never -q dependency:go-offline || true
9+
10+
dependencies:
11+
override:
12+
- mvn -q -DskipTests clean install dependency:resolve-plugins dependency:go-offline
13+
14+
test:
15+
override:
16+
- mvn test
17+
post:
18+
- mkdir -p $CIRCLE_TEST_REPORTS/junit/
19+
- find . -type f -regex ".*/target/surefire-reports/.*xml" -exec cp {} $CIRCLE_TEST_REPORTS/junit/ \;

dd-java-agent-ittests/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
</parent>
99

1010
<artifactId>dd-java-agent-ittests</artifactId>
11-
<packaging>jar</packaging>
1211
<name>dd-java-agent-ittests</name>
1312
<description>Datadog Java Agent integration tests</description>
1413
<url>https://github.com/datadog/dd-trace-java</url>
14+
<packaging>pom</packaging>
1515

1616

1717
<properties>

dd-java-agent/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
</parent>
99

1010
<artifactId>dd-java-agent</artifactId>
11-
<packaging>jar</packaging>
1211
<name>dd-java-agent</name>
1312
<description>Datadog Java Agent for tracing</description>
1413
<url>https://github.com/datadog/dd-trace-java</url>
14+
<packaging>jar</packaging>
1515

1616

1717
<properties>

dd-trace-annotations/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
<artifactId>dd-trace-java</artifactId>
77
<version>0.1.2-SNAPSHOT</version>
88
</parent>
9-
<groupId>com.datadoghq</groupId>
109
<artifactId>dd-trace-annotations</artifactId>
1110
<version>0.1.2-SNAPSHOT</version>
1211
<name>dd-trace-annotations</name>
13-
<url>http://maven.apache.org</url>
12+
<url>https://github.com/datadog/dd-trace-java</url>
13+
<packaging>jar</packaging>
1414
<properties>
1515
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1616
</properties>

dd-trace/pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
</parent>
1010

1111
<artifactId>dd-trace</artifactId>
12-
<packaging>jar</packaging>
1312
<name>dd-trace</name>
1413
<description>Datadog core library</description>
1514
<url>https://github.com/datadog/dd-trace-java</url>
15+
<packaging>jar</packaging>
1616

1717
<dependencies>
1818

@@ -121,10 +121,10 @@
121121
<pattern>com.fasterxml</pattern>
122122
<shadedPattern>dd.com.fasterxml</shadedPattern>
123123
</relocation>
124-
<relocation>
125-
<pattern>com.google</pattern>
126-
<shadedPattern>dd.com.google</shadedPattern>
127-
</relocation>
124+
<!--<relocation>-->
125+
<!--<pattern>com.google</pattern>-->
126+
<!--<shadedPattern>dd.com.google</shadedPattern>-->
127+
<!--</relocation>-->
128128
<relocation>
129129
<pattern>org.yaml</pattern>
130130
<shadedPattern>dd.org.yaml</shadedPattern>

0 commit comments

Comments
 (0)