build: fix signing ignore conditions to make CI checkDist job happy
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/52ece384 Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/52ece384 Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/52ece384 Branch: refs/heads/develop Commit: 52ece384c84460300bafdee662b3f56324202840 Parents: c6b4ac3 Author: Paul Merlin <[email protected]> Authored: Mon Apr 3 15:30:30 2017 +0200 Committer: Paul Merlin <[email protected]> Committed: Mon Apr 3 15:30:30 2017 +0200 ---------------------------------------------------------------------- .../apache/polygene/gradle/code/PublishingPlugin.groovy | 4 ++-- .../structure/distributions/DistributionsPlugin.groovy | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/polygene-java/blob/52ece384/buildSrc/src/main/groovy/org/apache/polygene/gradle/code/PublishingPlugin.groovy ---------------------------------------------------------------------- diff --git a/buildSrc/src/main/groovy/org/apache/polygene/gradle/code/PublishingPlugin.groovy b/buildSrc/src/main/groovy/org/apache/polygene/gradle/code/PublishingPlugin.groovy index 8f48922..be239b8 100644 --- a/buildSrc/src/main/groovy/org/apache/polygene/gradle/code/PublishingPlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/polygene/gradle/code/PublishingPlugin.groovy @@ -117,10 +117,10 @@ class PublishingPlugin implements Plugin<Project> { project.plugins.apply 'signing' def signing = project.extensions.getByType SigningExtension - signing.required = config.signed + signing.required = config.signed && !project.findProperty( 'skipSigning' ) signing.sign project.configurations.getByName( 'archives' ) def signArchives = project.tasks.getByName( 'signArchives' ) as Sign - signArchives.enabled = config.signed + signArchives.enabled = config.signed && !project.findProperty( 'skipSigning' ) signArchives.onlyIf { !project.findProperty( 'skipSigning' ) } } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/52ece384/buildSrc/src/main/groovy/org/apache/polygene/gradle/structure/distributions/DistributionsPlugin.groovy ---------------------------------------------------------------------- diff --git a/buildSrc/src/main/groovy/org/apache/polygene/gradle/structure/distributions/DistributionsPlugin.groovy b/buildSrc/src/main/groovy/org/apache/polygene/gradle/structure/distributions/DistributionsPlugin.groovy index ab62df6..23a3fb6 100644 --- a/buildSrc/src/main/groovy/org/apache/polygene/gradle/structure/distributions/DistributionsPlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/polygene/gradle/structure/distributions/DistributionsPlugin.groovy @@ -436,15 +436,15 @@ class DistributionsPlugin implements Plugin<Project> def releaseSpec = project.extensions.getByType( ReleaseSpecExtension ) project.plugins.apply 'signing' def signing = project.extensions.getByType SigningExtension - signing.required = !releaseSpec.developmentVersion - def distTasks = [TaskNames.ZIP_SOURCE_DIST, TaskNames.TAR_SOURCE_DIST, - TaskNames.ZIP_BINARY_DIST, TaskNames.TAR_BINARY_DIST] + signing.required = !releaseSpec.developmentVersion && !project.findProperty( 'skipSigning' ) + def distTasks = [ TaskNames.ZIP_SOURCE_DIST, TaskNames.TAR_SOURCE_DIST, + TaskNames.ZIP_BINARY_DIST, TaskNames.TAR_BINARY_DIST ] .collect { taskName -> project.tasks.getByName( taskName ) } distTasks.each { distTask -> distTask.finalizedBy signing.sign( distTask ) } - project.tasks.withType(Sign) { Sign task -> - task.enabled = !releaseSpec.developmentVersion + project.tasks.withType( Sign ) { Sign task -> + task.enabled = !releaseSpec.developmentVersion && !project.findProperty( 'skipSigning' ) task.onlyIf { !project.findProperty( 'skipSigning' ) } } }
