cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mshu...@apache.org
Subject cassandra-builds git commit: Fix tag parsing for tentative release tags
Date Mon, 19 Jun 2017 19:38:57 GMT
Repository: cassandra-builds
Updated Branches:
  refs/heads/master f7e9d86c7 -> e833f2184


Fix tag parsing for tentative release tags


Project: http://git-wip-us.apache.org/repos/asf/cassandra-builds/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra-builds/commit/e833f218
Tree: http://git-wip-us.apache.org/repos/asf/cassandra-builds/tree/e833f218
Diff: http://git-wip-us.apache.org/repos/asf/cassandra-builds/diff/e833f218

Branch: refs/heads/master
Commit: e833f2184f8fc107f5d523dc02034f815ce8ea27
Parents: f7e9d86
Author: Michael Shuler <michael@pbandjelly.org>
Authored: Mon Jun 19 14:38:45 2017 -0500
Committer: Michael Shuler <michael@pbandjelly.org>
Committed: Mon Jun 19 14:38:45 2017 -0500

----------------------------------------------------------------------
 docker/build-debs.sh | 8 +++++---
 docker/build-rpms.sh | 8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra-builds/blob/e833f218/docker/build-debs.sh
----------------------------------------------------------------------
diff --git a/docker/build-debs.sh b/docker/build-debs.sh
index 39bd688..c1dd469 100755
--- a/docker/build-debs.sh
+++ b/docker/build-debs.sh
@@ -22,10 +22,12 @@ is_branch=false
 git_version=''
 
 if [ "$tag" ]; then
-   # Official release
    is_tag=true
-   regx_tag="cassandra-([0-9.]+)(-tentative)?$"
-   if [[ $tag =~ $regx_tag ]]; then
+   # Official release
+   regx_tag="cassandra-([0-9.]+)$"
+   # Tentative release
+   regx_tag_tentative="([0-9.]+)-tentative$"
+   if [[ $tag =~ $regx_tag ]] || [[ $tag =~ $regx_tag_tentative ]]; then
       git_version=${BASH_REMATCH[1]}
    else
       echo "Error: could not recognize version from tag $tag">&2

http://git-wip-us.apache.org/repos/asf/cassandra-builds/blob/e833f218/docker/build-rpms.sh
----------------------------------------------------------------------
diff --git a/docker/build-rpms.sh b/docker/build-rpms.sh
index 3bfd69e..d39a3aa 100755
--- a/docker/build-rpms.sh
+++ b/docker/build-rpms.sh
@@ -30,10 +30,12 @@ if [[ $buildxml_version =~ $regx_snapshot ]]; then
 fi
 
 if [ "$tag" ]; then
-   # Official release
    is_tag=true
-   regx_tag="cassandra-([0-9.]+)(-tentative)?$"
-   if [[ $tag =~ $regx_tag ]]; then
+   # Official release
+   regx_tag="cassandra-([0-9.]+)$"
+   # Tentative release
+   regx_tag_tentative="([0-9.]+)-tentative$"
+   if [[ $tag =~ $regx_tag ]] || [[ $tag =~ $regx_tag_tentative ]]; then
       git_version=${BASH_REMATCH[1]}
    else
       echo "Error: could not recognize version from tag $tag">&2


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


Mime
View raw message