Add support for v2 tag version

Author: jabou

app-deploy.sh

@@ -13,11 +13,9 @@ source /usr/local/bin/.app-deploy-sources/__deploy_tags.sh
 #          Script used for creating the specific              #
 #        tag used for triggering the CI deployment            #
 #                                                             #
-#               End tag should look like this:                #
-#                  internal-all/v1.0.0-1234                   #
 #                                                             #
 #                Prepared by Jasmin Abou Aldan                #
-#       Copyright (c) 2020 Infinum. All rights reserved.      #
+#       Copyright (c) 2024 Infinum. All rights reserved.      #
 ###############################################################
 
 # Use global variables at your own risk as this can be overridden in the future.
@@ -45,7 +43,12 @@ function main {
 
     deploy_options # Get from .deploy-options.sh, setup per project
     __input_to_tags
-    __create_app_version_and_build_number
+
+    if [ -z "$script_version" ] || [ "$script_version" == "v1" ]; then
+        __create_app_version_and_build_number
+    elif [ "$script_version" == "v2" ]; then
+        __create_trigger_ci_timestamp_tag
+    fi
 
     # CREATE CHANGELOG
 

sources/__base_tag_handling.sh

@@ -20,6 +20,7 @@ function __input_to_tags {
 }
 
 # Generate app version and build number
+# Used in v1 version of the script
 function __create_app_version_and_build_number {
 
     echo
@@ -68,6 +69,28 @@ function __create_app_version_and_build_number {
     sleep 1
 }
 
+# Generate trigger tag with timestamp
+# Used in v2 version of the script
+function __create_trigger_ci_timestamp_tag {
+
+    # Create tag name ci/{environment}/{timestamp}}. E.g. ci/internal-staging/2024-12-05T17-16-28
+    tags_to_deploy=()
+
+    # Prefix ci
+    trigger_tag="ci/"
+
+    # Environments
+    for target in "${environments_to_build[@]}"; do
+        trigger_tag+="$target/"
+    done
+
+    # Sufix timestamp 
+    trigger_tag+="$(date +%Y-%m-%dT%H-%M-%S)"
+
+    # Assign to shared property
+    tags_to_deploy=("$trigger_tag")
+}
+
 # Changelog
 function __generate_tag_and_changelog {
 

sources/__deploy_tags.sh

@@ -18,7 +18,9 @@ function __push_tag_and_start_deploy {
     echo "---------------------------------------------------------------"
     echo "                      ~ CONFIGURATION ~   "
     echo
-    echo "Version: ${bold}v$appversion-$tags_count${normal}"        
+    if [ -n "$appversion" ]; then
+        echo "Version: ${bold}v$appversion-$tags_count${normal}"        
+    fi
     for tag in "${tags_to_deploy[@]}"; do
         echo "Tag: ${bold}$tag${normal}"
     done