allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hei...@apache.org
Subject allura git commit: Tags under rel/ are recommended by ASF infra as they will be unmodifiable
Date Tue, 19 Jan 2016 22:14:02 GMT
Repository: allura
Updated Branches:
  refs/heads/master a9ed64eaf -> 999c0e5c6


Tags under rel/ are recommended by ASF infra as they will be unmodifiable


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/999c0e5c
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/999c0e5c
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/999c0e5c

Branch: refs/heads/master
Commit: 999c0e5c6e5af739e28bb297d0fb0a683c03e69c
Parents: a9ed64e
Author: Dave Brondsema <dave@brondsema.net>
Authored: Mon Jan 18 15:57:26 2016 -0500
Committer: Heith Seewald <heiths@gmail.com>
Committed: Tue Jan 19 16:59:46 2016 -0500

----------------------------------------------------------------------
 scripts/asf-release.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/999c0e5c/scripts/asf-release.sh
----------------------------------------------------------------------
diff --git a/scripts/asf-release.sh b/scripts/asf-release.sh
index c032628..5e3cbba 100755
--- a/scripts/asf-release.sh
+++ b/scripts/asf-release.sh
@@ -34,7 +34,7 @@ function prompt() {
 
 RELEASE_DIR_BASE=/tmp
 
-PREV_VERSION=`git tag -l asf_release_* | sort -rn | head -1 | sed -e 's/^asf_release_//'`
+PREV_VERSION=`git tag -l rel/* | sort -rn | head -1 | sed -e 's/^rel\///'`
 VERSION=`echo $PREV_VERSION | perl -pe '@_ = split /\./; $_[-1]++; $_ = join ".", @_'`
 prompt VERSION "Version" "$VERSION"
 
@@ -43,10 +43,10 @@ RELEASE_DIR=$RELEASE_DIR_BASE/$RELEASE_BASE
 RELEASE_FILENAME=$RELEASE_BASE.tar.gz
 RELEASE_FILE_EXTRACTED=$RELEASE_DIR/$RELEASE_BASE
 RELEASE_FILE=$RELEASE_DIR/$RELEASE_FILENAME
-RELEASE_TAG=asf_release_$VERSION
+RELEASE_TAG=rel/$VERSION
 CLOSE_DATE=`date -d '+72 hours' -R --utc | sed -e 's/+0000/UTC/'`
 
-scripts/changelog.py asf_release_$PREV_VERSION HEAD $VERSION > .changelog.tmp
+scripts/changelog.py rel/$PREV_VERSION HEAD $VERSION > .changelog.tmp
 echo >> .changelog.tmp
 cat CHANGES >> .changelog.tmp
 mv -f .changelog.tmp CHANGES
@@ -115,7 +115,7 @@ The release has been signed with key ($KEY):
 
 Source corresponding to this release can be found at:
   Commit: $COMMIT_SHA
-  Tag:    asf_release_$VERSION (pending successful vote)
+  Tag:    $RELEASE_TAG (pending successful vote)
   Browse: https://forge-allura.apache.org/p/allura/git/ci/$COMMIT_SHA/log/
 
 Changes for this version are listed at:


Mime
View raw message