Merge pull request #99 from Axway/APIGOV-27843

APIGOV-27843 - final changes for tagging

.gitlab-ci.yml

@@ -76,6 +76,7 @@ twistlock-discovery:on-schedule:
     - !reference [.mirror-schedule-csr-rules, rules]
   dependencies: []
   variables:
+    # need to override this variable for github agents because the tag willneed the 'v' if it exists
     NO_V_RELEASE_TAG_REGEX: "^v?[0-9]{1,}\\.[0-9]{1,}\\.[0-9]{1,}$"
   before_script:
     - !reference [.get-agent-last-tag, script]

release.sh

@@ -26,13 +26,6 @@ check_required_variables() {
         exit 1
     fi
 
-    # don't post if this is a pre-release tag
-    pat='[0-9]+\.[0-9]+\.[0-9]+-'
-    if [[ ${TAG} =~ $pat ]]; then
-      echo "This is an interim release... post to Teams skipped"
-      return 0
-    fi
-
     return 0
 }
 
@@ -50,6 +43,13 @@ get_sdk_version()
 }
 
 post_to_teams() {
+    # don't post if this is a pre-release tag
+    pat='[0-9]+\.[0-9]+\.[0-9]+-'
+    if [[ ${TAG} =~ $pat ]]; then
+      echo "This is an interim release... skipping the post to Teams"
+      return 0
+    fi
+
     rel_date=$(date +'%m/%d/%Y')
     JSON="{
         \"@type\": \"MessageCard\",
@@ -65,9 +65,9 @@ post_to_teams() {
              }]
          }]
         }"
-    # curl -v ${TEAMS_WEBHOOK_URL} \
-    # -H 'Content-Type: application/json' \
-    # -d "${JSON}" &> /dev/null
+    curl -v ${TEAMS_WEBHOOK_URL} \
+    -H 'Content-Type: application/json' \
+    -d "${JSON}" &> /dev/null
 }
 
 main() {