You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2017/09/07 15:08:45 UTC
groovy-release git commit: tweak release based on 2.6.0-alpha-1
feedback (closes #1)
Repository: groovy-release
Updated Branches:
refs/heads/master 605c6d0a6 -> b3b8a91f6
tweak release based on 2.6.0-alpha-1 feedback (closes #1)
Project: http://git-wip-us.apache.org/repos/asf/groovy-release/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy-release/commit/b3b8a91f
Tree: http://git-wip-us.apache.org/repos/asf/groovy-release/tree/b3b8a91f
Diff: http://git-wip-us.apache.org/repos/asf/groovy-release/diff/b3b8a91f
Branch: refs/heads/master
Commit: b3b8a91f63f0e9b8f374d0e5e8bcb59898f227c2
Parents: 605c6d0
Author: paulk <pa...@asert.com.au>
Authored: Fri Sep 8 01:08:34 2017 +1000
Committer: paulk <pa...@asert.com.au>
Committed: Fri Sep 8 01:08:34 2017 +1000
----------------------------------------------------------------------
build.gradle | 11 +++++++----
gradle/adhoc.gradle | 19 ++++++++++++++++++-
gradle/phase1.gradle | 4 ++--
gradle/phase2.gradle | 25 +++++++++++++------------
4 files changed, 40 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy-release/blob/b3b8a91f/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 7a04c4a..7e38050 100644
--- a/build.gradle
+++ b/build.gradle
@@ -89,12 +89,15 @@ ext {
underVersion = relVersion?.replace('.', '_')?.replace('-', '_')?.toUpperCase()
releaseBuild = !relVersion?.toLowerCase()?.contains('snapshot')
stableBuild = releaseBuild && !relVersion?.toLowerCase()?.contains('alpha') && !relVersion?.toLowerCase()?.contains('beta') && !relVersion?.toLowerCase()?.contains('rc')
- if (stableBuild) {
+ if (releaseBuild) {
def parts = relVersion?.split(/\./)
baseVersion = parts?.with{ "${it[0]}.${it[1]}.0" }
- nextVersion = parts?.with{ "${it[0]}.${it[1]}.${it[2].toInteger() + 1}" }
- if (!newRelease) {
- prevVersion = parts?.with{ "${it[0]}.${it[1]}.${it[2].toInteger() - 1}" }
+ if (stableBuild) {
+ nextVersion = [parts[0], parts[1], parts[2].toInteger() + 1].join('.')
+ } else {
+ def subparts = parts[2]?.split(/-/)
+ def part2 = [subparts[0], subparts[1], subparts[2].toInteger() + 1].join('-')
+ nextVersion = [parts[0], parts[1], part2].join('.')
}
}
devWorkspaceRoot = "$project.buildDir/svn-dev-workspace-$branch"
http://git-wip-us.apache.org/repos/asf/groovy-release/blob/b3b8a91f/gradle/adhoc.gradle
----------------------------------------------------------------------
diff --git a/gradle/adhoc.gradle b/gradle/adhoc.gradle
index 34edb22..7f7a462 100644
--- a/gradle/adhoc.gradle
+++ b/gradle/adhoc.gradle
@@ -45,7 +45,7 @@ task websiteBuild(type: Exec, dependsOn: [assumesRelVersion, checkoutGroovyWebsi
if (Os.isFamily(Os.FAMILY_WINDOWS)) {
theArgs += ['cmd', '/C', 'gradlew.bat']
} else {
- theArgs << './gradlew'
+ theArgs += ['sh', './gradlew']
}
theArgs << 'webzip'
commandLine theArgs
@@ -100,3 +100,20 @@ task unreleaseOnJira(dependsOn: jiraCheckPhase2) {
assert resp.status == 200
}
}
+
+task showInfo(dependsOn: assumesPropsSet) {
+ doLast {
+ println "branch = $branch"
+ println "relVersion = $relVersion"
+ println "stagingDir = $stagingDir"
+ println "newRelease = $newRelease"
+ println "releaseBuild = $releaseBuild"
+ println "stableBuild = $stableBuild"
+ println "nextVersion = $nextVersion"
+ println "baseVersion = $baseVersion"
+ println "underVersion = $underVersion"
+ println "devWorkspace = $devWorkspace"
+ println "releaseWorkspace = $releaseWorkspace"
+ println "stagingWebsiteDir = $stagingWebsiteDir"
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/groovy-release/blob/b3b8a91f/gradle/phase1.gradle
----------------------------------------------------------------------
diff --git a/gradle/phase1.gradle b/gradle/phase1.gradle
index 9e8ddf3..aa85818 100644
--- a/gradle/phase1.gradle
+++ b/gradle/phase1.gradle
@@ -77,7 +77,7 @@ task checkCompatibility(type: Exec, dependsOn: [assumesBranch, checkout]) {
if (Os.isFamily(Os.FAMILY_WINDOWS)) {
theArgs += ['cmd', '/C', 'gradlew.bat']
} else {
- theArgs << './gradlew'
+ theArgs += ['sh', './gradlew']
}
theArgs << 'checkCompatibility'
commandLine theArgs
@@ -144,7 +144,7 @@ task buildAndUpload(type: Exec, dependsOn: [assumesPropsSet, updateVersionProper
if (Os.isFamily(Os.FAMILY_WINDOWS)) {
theArgs += ['cmd', '/C', 'gradlew.bat']
} else {
- theArgs << './gradlew'
+ theArgs += ['sh', './gradlew']
}
if (project.hasProperty('useAntlr4')) {
theArgs << "-PuseAntlr4=${getProperty('useAntlr4')}"
http://git-wip-us.apache.org/repos/asf/groovy-release/blob/b3b8a91f/gradle/phase2.gradle
----------------------------------------------------------------------
diff --git a/gradle/phase2.gradle b/gradle/phase2.gradle
index e19848b..9546405 100644
--- a/gradle/phase2.gradle
+++ b/gradle/phase2.gradle
@@ -129,7 +129,7 @@ task synchronizeWithMavenCentral(dependsOn: promoteOnBintray) {
description = "Syncs with Maven Central/Sonatype"
doLast {
def bintray = new RESTClient('https://api.bintray.com/maven_central_sync/groovy/maven/')
- bintray.headers['Authorization'] = 'Basic ' + "$bintrayUser:$bintrayPassword".getBytes('iso-8859-1').encodeBase64()
+// bintray.headers['Authorization'] = 'Basic ' + "$bintrayUser:$bintrayKey".getBytes('iso-8859-1').encodeBase64()
def body = /{
"username" : "${project.findProperty('centralUser')}",
"password" : "${project.findProperty('centralKey')}"
@@ -151,11 +151,11 @@ task publishZipsOnBintray(dependsOn: [jiraCheckPhase2, assumesRelVersion]) {
description = "Publish distribution zips to bintray"
doLast {
def bintray = new RESTClient('https://api.bintray.com/content/groovy/maven/')
- bintray.headers['Authorization'] = 'Basic ' + "$bintrayUser:$bintrayPassword".getBytes('iso-8859-1').encodeBase64()
+ bintray.headers['Authorization'] = 'Basic ' + "$bintrayUser:$bintrayKey".getBytes('iso-8859-1').encodeBase64()
fileTree("$stagingDir/target/distributions").files.each { File f ->
println "Uploading $f.name"
def resp = bintray.put(
- path: "groovy/$version/${f.name}",
+ path: "groovy/$relVersion/${f.name}",
body: f.bytes,
requestContentType: BINARY
)
@@ -166,7 +166,6 @@ task publishZipsOnBintray(dependsOn: [jiraCheckPhase2, assumesRelVersion]) {
}
}
-
task cleanSvnReleaseWorkspace(type: Delete, dependsOn: [assumesRelVersion, synchronizeWithMavenCentral, publishZipsOnBintray]) {
delete releaseWorkspaceRoot
}
@@ -246,11 +245,11 @@ task findGroovyVersions(dependsOn: checkoutGroovyWebsite) {
def sitemapFile = file("$stagingWebsiteDir/site/src/site/sitemap.groovy")
def matcher = sitemapFile.text =~ /(?ism).*groovyDocumentationVersions\(([^)]*)\).*/
assert matcher[0]
- rootProject.ext.versionsText = matcher[0][1]
+ def versionsText = matcher[0][1]
def majorMinor = { String s -> s.split(/\./).with{ it[0].toInteger() * 100 + it[1].toInteger() } }
def versions = Eval.me(versionsText)
def relMajorMinor = majorMinor(relVersion)
- rootProject.ext.foundNewer = versions.findAll{ !(it.contains('alpha') || it.contains('beta') || it.contains('rc')) }.collect{ majorMinor(it) }.any{ it > relMajorMinor }
+ def foundNewer = versions.findAll{ !(it.contains('alpha') || it.contains('beta') || it.contains('rc')) }.collect{ majorMinor(it) }.any{ it > relMajorMinor }
rootProject.ext.newDefault = project.hasProperty('forceDefault') ||
(!project.hasProperty('skipDefault') && stableBuild && !foundNewer)
}
@@ -286,7 +285,7 @@ task updateGroovySitemap(dependsOn: findGroovyVersions) {
sitemapFile.text = sitemapText
}
}
-updateGroovySitemap.onlyIf{ stableBuild }
+updateGroovySitemap.onlyIf{ releaseBuild }
task pushGroovyWebsite(dependsOn: updateGroovySitemap) {
group = "Post-passed phase"
@@ -300,7 +299,7 @@ task pushGroovyWebsite(dependsOn: updateGroovySitemap) {
grgit.push()
}
}
-pushGroovyWebsite.onlyIf{ stableBuild }
+pushGroovyWebsite.onlyIf{ releaseBuild }
task waitForWebsitePublication(dependsOn: pushGroovyWebsite) {
group = "Post-passed phase"
@@ -321,7 +320,7 @@ task waitForWebsitePublication(dependsOn: pushGroovyWebsite) {
assert found, 'Timed out waiting for website to be published - please check manually'
}
}
-waitForWebsitePublication.onlyIf{ stableBuild }
+waitForWebsitePublication.onlyIf{ releaseBuild }
task publishToSDKman(dependsOn: [waitForWebsitePublication, maybeUpdateDocumentationSymlink, sdkReleaseVersion]) {
group = "Post-passed phase"
@@ -358,7 +357,6 @@ task bumpVersionInGit(dependsOn: createNextVersionInJira) {
group = "Post-passed phase"
description = "The version in the gradle.properties file in the branch repo should be bumped"
doLast {
- // TODO should this handle beta-1 => beta-2, rc-1 => rc-2 etc.
def apacheCredentials = new Credentials(username: apacheUser, password: apachePassword)
def grgit = grgitClass.open(dir: stagingDir, creds: apacheCredentials)
grgit.checkout(branch: branch)
@@ -373,14 +371,17 @@ task bumpVersionInGit(dependsOn: createNextVersionInJira) {
grgit.push()
}
}
+bumpVersionInGit.onlyIf{ stableBuild }
-task proposeAnnouncementEmail(dependsOn: [bumpVersionInGit, jiraCheckPhase2]) {
+task proposeAnnouncementEmail(dependsOn: [bumpVersionInGit, findGroovyVersions, jiraCheckPhase2]) {
group = "Post-passed phase"
description = "Generates an [ANNOUNCE] thread to be tweaked and sent to the dev@, user@ and announce@ mailing lists"
doLast {
def securityFix = project.hasProperty('securityFix')
println """"
-Below is a template email to tweak and send to the dev@, user@ and announce@ mailing lists as an [ANNOUNCE] thread.
+Below is a template email to tweak and send to the normaly mailing lists including
+dev@groovy.apache.org, users@groovy.apache.org and announce@apache.org mailing lists
+as an [ANNOUNCE] thread. This should be sent using an Apache email from address.
---------------- >8 -----------------