groovy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pa...@apache.org
Subject groovy-release git commit: add some extra flags, change to sitemap-user
Date Sun, 11 Nov 2018 21:14:34 GMT
Repository: groovy-release
Updated Branches:
  refs/heads/master 5a9d3fe52 -> 6f4d4769d


add some extra flags, change to sitemap-user


Project: http://git-wip-us.apache.org/repos/asf/groovy-release/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy-release/commit/6f4d4769
Tree: http://git-wip-us.apache.org/repos/asf/groovy-release/tree/6f4d4769
Diff: http://git-wip-us.apache.org/repos/asf/groovy-release/diff/6f4d4769

Branch: refs/heads/master
Commit: 6f4d4769d30bb8b7b81e97aa8963aac0b21dcd9e
Parents: 5a9d3fe
Author: Paul King <paulk@asert.com.au>
Authored: Mon Nov 12 07:14:22 2018 +1000
Committer: Paul King <paulk@asert.com.au>
Committed: Mon Nov 12 07:14:22 2018 +1000

----------------------------------------------------------------------
 gradle/phase1.gradle | 10 +++++++---
 gradle/phase2.gradle |  8 ++++----
 2 files changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/groovy-release/blob/6f4d4769/gradle/phase1.gradle
----------------------------------------------------------------------
diff --git a/gradle/phase1.gradle b/gradle/phase1.gradle
index a0f556f..a98b3fd 100644
--- a/gradle/phase1.gradle
+++ b/gradle/phase1.gradle
@@ -90,7 +90,9 @@ task jiraPrecheck(dependsOn: assumesRelVersion) {
         assert resp.status == 200 && resp.data
         def versionFields = resp.data.find { it.name == relVersion }
         assert versionFields, "Version $relVersion not found in Jira!"
-        assert !versionFields.released, "Version $relVersion already released!"
+        if (!project.hasProperty('skipJiraReleaseCheck')) {
+            assert !versionFields.released, "Version $relVersion already released!"
+        }
         project.ext.versionId = versionFields.id
         project.ext.projectId = versionFields.projectId
 
@@ -227,7 +229,7 @@ task createAndPushTag(dependsOn: [assumesPropsSet, checkDevWorkspaceVersion])
{
             tag = JGitUtil.resolveTag(grgit.repository, tagName)
         } catch (ignore) {
         }
-        if (project.hasProperty('skipTag')) {
+        if (project.hasProperty('skipSvnTag')) {
             assert tag, "Tag $tagName is supposed to exist but doesn't!"
         } else {
             assert !tag, "Tag $tagName already found!"
@@ -237,7 +239,9 @@ task createAndPushTag(dependsOn: [assumesPropsSet, checkDevWorkspaceVersion])
{
             )
         }
         project.ext.tagId = tag.commit.id
-        grgit.push(tags: true)
+        if (!project.hasProperty('skipSvnPush')) {
+            grgit.push(tags: true)
+        }
     }
 }
 

http://git-wip-us.apache.org/repos/asf/groovy-release/blob/6f4d4769/gradle/phase2.gradle
----------------------------------------------------------------------
diff --git a/gradle/phase2.gradle b/gradle/phase2.gradle
index ed71a7d..f204884 100644
--- a/gradle/phase2.gradle
+++ b/gradle/phase2.gradle
@@ -171,7 +171,7 @@ task publishZipsOnBintray(dependsOn: [jiraCheckPhase2, assumesRelVersion])
{
     }
 }
 
-task cleanSvnReleaseWorkspace(type: Delete, dependsOn: [assumesRelVersion, synchronizeWithMavenCentral,
publishZipsOnBintray]) {
+task cleanSvnReleaseWorkspace(type: Delete, dependsOn: assumesRelVersion) {
     delete releaseWorkspaceRoot
 }
 
@@ -287,9 +287,9 @@ maybeUpdateDocumentationSymlink.onlyIf{ newDefault }
 
 task updateGroovySitemap(dependsOn: findGroovyVersions) {
     group = "Post-passed phase"
-    description = "Updates sitemap.groovy to include the newly released version and commits
the result"
+    description = "Updates sitemap-user.groovy to include the newly released version and
commits the result"
     doLast {
-        def sitemapFile = file("$stagingWebsiteDir/site/src/site/sitemap.groovy")
+        def sitemapFile = file("$stagingWebsiteDir/site/src/site/sitemap-user.groovy")
         def sitemapText = sitemapFile.text
         def newText = newRelease ? versionsText.replaceFirst(/(?sm)'\s*\]/, "',\n       
    '$relVersion'\n    \\]")
                 : versionsText.replaceFirst(/(?sm)(.*)('$baseVersion'[',. 0-9]*)/, "\$1\$2
'$relVersion',")
@@ -335,7 +335,7 @@ task waitForWebsitePublication(dependsOn: pushGroovyWebsite) {
 }
 waitForWebsitePublication.onlyIf{ releaseBuild }
 
-task publishToSDKman(dependsOn: [waitForWebsitePublication, maybeUpdateDocumentationSymlink,
uploadToApacheReleaseServer, sdkReleaseVersion]) {
+task publishToSDKman(dependsOn: [waitForWebsitePublication, maybeUpdateDocumentationSymlink,
synchronizeWithMavenCentral, publishZipsOnBintray, uploadToApacheReleaseServer, sdkReleaseVersion])
{
     group = "Post-passed phase"
     description = "Publishes the release on SDKman"
 }


Mime
View raw message