Skip to content

Commit d9da2e1

Browse files
authored
Fix CI config (#56)
1 parent d8073a9 commit d9da2e1

File tree

3 files changed

+22
-16
lines changed

3 files changed

+22
-16
lines changed

.circleci/config.yml

+15-11
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ jobs:
55
Build core library
66
docker:
77
- image: circleci/openjdk:8-jdk
8-
working_directory: ~/repo
98
environment:
109
JVM_OPTS: -Xmx3200m
1110
TERM: dumb
11+
working_directory: ~/repo
1212
steps:
1313
- checkout
1414
- run:
@@ -19,12 +19,12 @@ jobs:
1919
- deps-{{checksum ".circle-cache-key"}}
2020
- run:
2121
name: Build and run unit tests
22-
command: gradle install
22+
command: gradle build
2323
- save_cache:
2424
paths:
2525
- ~/.gradle
2626
- ~/.m2
27-
key: deps-{{checksum ".circle-cache-key"}}-{{ .Environment.CIRCLE_SHA1 }}-{{ .Environment.CIRCLE_WORKFLOW_ID }}
27+
key: deps-{{checksum ".circle-cache-key"}}
2828
- run:
2929
name: Generate Code Coverage Report
3030
command: gradle codeCoverageReport
@@ -36,17 +36,16 @@ jobs:
3636
Build maven plugin
3737
docker:
3838
- image: circleci/openjdk:8-jdk
39-
working_directory: ~/repo
4039
environment:
4140
MAVEN_OPTS: -Xmx3200m
41+
working_directory: ~/repo
4242
steps:
4343
- checkout
4444
- run:
4545
name: Generate cache key
4646
command: date +%Y-%m > .circle-cache-key
4747
- restore_cache:
4848
keys:
49-
- deps-{{checksum ".circle-cache-key"}}-{{ .Environment.CIRCLE_SHA1 }}-{{ .Environment.CIRCLE_WORKFLOW_ID }}
5049
- deps-{{checksum ".circle-cache-key"}}
5150
- run:
5251
name: Load all dependencies
@@ -57,28 +56,30 @@ jobs:
5756
- ~/.m2
5857
key: deps-{{checksum ".circle-cache-key"}}
5958
- run:
60-
name: Build and run unit tests
59+
name: Build library
60+
command: cd ~/repo && gradle publishToMavenLocal -x test
61+
- run:
62+
name: Build plugin and run unit tests
6163
command: cd ~/repo/plugins/maven/graphql-java-codegen-maven-plugin && mvn install
6264
- run:
63-
name: Build example project
65+
name: Build example plugin project
6466
command: cd ~/repo/plugins/maven/example && mvn package
6567
build-graphql-java-codegen-gradle-plugin:
6668
description:
6769
Build gradle plugin
6870
docker:
6971
- image: circleci/openjdk:8-jdk
70-
working_directory: ~/repo
7172
environment:
7273
JVM_OPTS: -Xmx3200m
7374
TERM: dumb
75+
working_directory: ~/repo
7476
steps:
7577
- checkout
7678
- run:
7779
name: Generate cache key
7880
command: date +%Y-%m > .circle-cache-key
7981
- restore_cache:
8082
keys:
81-
- deps-{{checksum ".circle-cache-key"}}-{{ .Environment.CIRCLE_SHA1 }}-{{ .Environment.CIRCLE_WORKFLOW_ID }}
8283
- deps-{{checksum ".circle-cache-key"}}
8384
- run:
8485
name: Load all dependencies
@@ -89,10 +90,13 @@ jobs:
8990
- ~/.m2
9091
key: deps-{{checksum ".circle-cache-key"}}
9192
- run:
92-
name: Build and run unit tests
93+
name: Build library
94+
command: cd ~/repo && gradle publishToMavenLocal -x test
95+
- run:
96+
name: Build plugin and run unit tests
9397
command: cd ~/repo/plugins/gradle/graphql-java-codegen-gradle-plugin && gradle build publishToMavenLocal
9498
- run:
95-
name: Build example project
99+
name: Build example plugin project
96100
command: cd ~/repo/plugins/gradle/example && gradle test
97101
workflows:
98102
build-library-and-plugins:

build.gradle

+4-2
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,8 @@ publishing {
121121
}
122122
}
123123

124-
signing {
125-
sign publishing.publications.mavenJava
124+
if (project.hasProperty("signing.keyId")) {
125+
signing {
126+
sign publishing.publications.mavenJava
127+
}
126128
}

gradle.properties

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
signing.keyId=keyId
2-
signing.password=password
3-
signing.secretKeyRingFile=secretKeyRingFile
1+
#signing.keyId=keyId
2+
#signing.password=password
3+
#signing.secretKeyRingFile=secretKeyRingFile
44

55
sonatypeUsername=sonartypeUsername
66
sonatypePassword=sonartypePassword

0 commit comments

Comments
 (0)