more generic TAG split

vrince · May 4, 2022 · 60bee1a · 60bee1a
1 parent 38a3551
commit 60bee1a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/redis-timeseries.yml b/.github/workflows/redis-timeseries.yml
@@ -6,7 +6,7 @@ on:
   push:
     branches: [ master ]
     tags:
-      - 'redis_timeseries-*'
+      - 'redis_timeseries/*'
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:

diff --git a/.github/workflows/redis.yml b/.github/workflows/redis.yml
@@ -6,7 +6,7 @@ on:
   push:
     branches: [ master ]
     tags:
-      - 'redis-*'
+      - 'redis/*'
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:

diff --git a/build.sh b/build.sh
@@ -8,14 +8,17 @@ echo "🌿 Module(${MODULE})"
 echo "🦑 Arch(${ARCH})"
 echo "🏷️ Tag(${TAG})"
 
+if [[ -n ${TAG} ]] ; then
+    TAG=$(echo ${TAG} | cut -d '/' -f2)
+fi
+
+echo "🏷️ Tag(${TAG})"
+
 if [[ ${MODULE} == "redis_timeseries" ]] ; then
 
     if [[ -z ${TAG} || ${TAG} == "master" ]] ; then
         TAG="v1.6.9"
         echo "Using default tag(${TAG})"
-    else
-        TAG=$(echo ${TAG} | cut -d 'v' -f2)
-        TAG="v${TAG}"
     fi
 
     echo "🐏 Cloning ..."
@@ -38,8 +41,6 @@ if [[ ${MODULE} == "redis" ]] ; then
     if [[ -z ${TAG} || ${TAG} == "master" ]] ; then
         TAG="7.0"
         echo "Using default tag(${TAG})"
-    else
-        TAG=$(echo ${TAG} | cut -d 'v' -f2)
     fi
 
     echo "🐏 Cloning ..."