Skip to content

Commit 6565719

Browse files
author
DvirDukhan
authored
changed circle ci not to deploy forked PR (#53)
* changed circle ci not to deploy forked PR * replaced codecov package
1 parent 2655359 commit 6565719

File tree

2 files changed

+35
-26
lines changed

2 files changed

+35
-26
lines changed

.circleci/config.yml

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,25 @@
22
#
33
# Check https://circleci.com/docs/2.0/language-java/ for more details
44
#
5-
version: 2
5+
version: 2.1
6+
commands:
7+
early_return_for_forked_pull_requests:
8+
description: >-
9+
If this build is from a fork, stop executing the current job and return success.
10+
This is useful to avoid steps that will fail due to missing credentials.
11+
steps:
12+
- run:
13+
name: Early return if this build is from a forked PR
14+
command: |
15+
if [ -n "$CIRCLE_PR_NUMBER" ]; then
16+
echo "Nothing to do for forked PRs, so marking this step successful"
17+
circleci step halt
18+
fi
619
jobs:
720
build:
821
docker:
922
- image: circleci/openjdk:8u171-jdk
10-
1123
- image: redislabs/redisgraph:edge
12-
port: 6379:6379
13-
1424
working_directory: ~/repo
1525

1626
environment:
@@ -38,12 +48,12 @@ jobs:
3848
# run tests!
3949
# - run: mvn pmd:check
4050

41-
- run: mvn integration-test
51+
- run: mvn integration-test
4252

43-
- run: mvn cobertura:cobertura
53+
- early_return_for_forked_pull_requests
4454

45-
- run: bash <(curl -s https://codecov.io/bash) -t ${CODECOV_TOKEN}
46-
55+
- run: bash <(curl -s https://codecov.io/bash) -t ${CODECOV_TOKEN}
56+
4757
- run: mvn -s .circleci.settings.xml -DskipTests deploy
4858

4959
workflows:

pom.xml

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -114,24 +114,23 @@
114114
<build>
115115
<plugins>
116116
<plugin>
117-
<groupId>org.codehaus.mojo</groupId>
118-
<artifactId>cobertura-maven-plugin</artifactId>
119-
<version>2.7</version>
120-
<configuration>
121-
<formats>
122-
<format>html</format>
123-
<format>xml</format>
124-
</formats>
125-
<check />
126-
</configuration>
127-
</plugin>
128-
<plugin>
129-
<artifactId>maven-compiler-plugin</artifactId>
130-
<version>3.0</version>
131-
<configuration>
132-
<source>1.8</source>
133-
<target>1.8</target>
134-
</configuration>
117+
<groupId>org.jacoco</groupId>
118+
<artifactId>jacoco-maven-plugin</artifactId>
119+
<version>0.8.5</version>
120+
<executions>
121+
<execution>
122+
<goals>
123+
<goal>prepare-agent</goal>
124+
</goals>
125+
</execution>
126+
<execution>
127+
<id>report</id>
128+
<phase>test</phase>
129+
<goals>
130+
<goal>report</goal>
131+
</goals>
132+
</execution>
133+
</executions>
135134
</plugin>
136135
<plugin>
137136
<groupId>org.sonatype.plugins</groupId>

0 commit comments

Comments
 (0)