Skip to content

Commit

Permalink
Merge pull request #366 from yidongnan/modify_deploy.gradle
Browse files Browse the repository at this point in the history
Modify deploy.gradle for github actions and test pull-request workflow
  • Loading branch information
yidongnan authored Jun 6, 2020
2 parents a7e8ef4 + d253c28 commit 5d4a4cc
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 15 deletions.
1 change: 0 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ buildscript {

springBootVersion = '2.2.7.RELEASE'
springCloudVersion = 'Hoxton.SR4'
springDependencyManagementVersion = '1.0.9.RELEASE'
springCloudAlibabaNacosVersion = '2.2.1.RELEASE'
springSecurityOAuthVersion = '2.4.1.RELEASE'

Expand Down
28 changes: 14 additions & 14 deletions deploy.gradle
Original file line number Diff line number Diff line change
@@ -1,21 +1,8 @@
apply plugin: 'maven-publish'
apply plugin: 'signing'

gradle.taskGraph.whenReady { taskGraph ->
if (taskGraph.allTasks.any { it instanceof Sign } && project.ext.isReleaseVersion) {
def id = System.getenv('GPG_ID')
def file = '/home/travis/.gnupg/secring.gpg'
def password = System.getenv('GPG_PASSWORD')

allprojects { ext."signing.keyId" = id }
allprojects { ext."signing.secretKeyRingFile" = file }
allprojects { ext."signing.password" = password }
}
}

ext {
isReleaseVersion = !(projectVersion =~ /-SNAPSHOT$/)
isNeedSign = System.getenv('GPG_ID') && isReleaseVersion
}

task sourcesJar(type: Jar) {
Expand Down Expand Up @@ -67,6 +54,15 @@ publishing {
url = 'https://github.com/yidongnan/grpc-spring-boot-starter'
}
}

versionMapping {
usage('java-api') {
fromResolutionOf('runtimeClasspath')
}
usage('java-runtime') {
fromResolutionResult()
}
}
}
}
repositories {
Expand All @@ -83,8 +79,12 @@ publishing {
}
}

tasks.withType(Sign) {
onlyIf { project.ext.isReleaseVersion && gradle.taskGraph.hasTask("publish") }
}

signing {
required { project.ext.isNeedSign }
useGpgCmd()
sign publishing.publications.mavenJava
}

Expand Down

0 comments on commit 5d4a4cc

Please sign in to comment.