Merge pull request #6 from Hipska/patch-1

Support patch releases
go-graphite · Oct 14, 2024 · 532d46c · 532d46c
2 parents 2b3d443 + a2ab02c
commit 532d46c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/docker/centos-7/create_package_rpm.sh b/docker/centos-7/create_package_rpm.sh
@@ -19,7 +19,7 @@ ARCH=$(uname -m)
 VERSION_GIT=$(git describe --abbrev=6 --always --tags | cut -c 2-)
 PKG_VERSION=""
 case ${VERSION_GIT} in
-    *-alpha*|*-beta*|*-rc*)
+    *-alpha*|*-beta*|*-rc*|*-patch*)
         VERSION=$(cut -d'-' -f 1 <<< ${VERSION_GIT})
         RELEASE=$(cut -d'-' -f 2 <<< ${VERSION_GIT})
         RELEASE2=$(cut -d'-' -f 3 <<< ${VERSION_GIT})

diff --git a/docker/centos-7/pack.sh b/docker/centos-7/pack.sh
@@ -29,7 +29,7 @@ pushd ~/go/src/github.com/go-graphite/"${1}/"
 make clean
 REPOS="autobuilds"
 
-git describe --abbrev=6 --dirty --always --tags | grep -q '^v[0-9]\+\.[0-9]\+\(\.[0-9]\+\)\?$'
+git describe --abbrev=6 --dirty --always --tags | grep -q '^v[0-9]\+\.[0-9]\+\(\.[0-9]\+\(\-patch[0-9]\+)\?\)\?$'
 if [[ $? -eq 0 ]]; then
         REPOS="stable autobuilds"
 fi