hotfix(release): corrected release variables to have more readability

Signed-off-by: Felipe Rios <[email protected]>
rios0rios0 · Dec 4, 2023 · 11e9483 · 11e9483
1 parent bfe7833
commit 11e9483
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/azure-devops/global/stages/40-delivery/release.yaml b/azure-devops/global/stages/40-delivery/release.yaml
@@ -1,12 +1,14 @@
 jobs:
   - job: 'release'
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'), contains(variables['Build.SourceVersionMessage'], 'origin/chore/bump-'))
+    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'), or(contains(variables['Build.SourceVersionMessage'], 'origin/chore/bump-'), contains(variables['Build.SourceVersionMessage'], 'chore(bump)')))
     steps:
       - script: |
           set -eux
           COMMIT_MESSAGE="$(git log -1 --pretty=%B)"
-          if echo -n "$COMMIT_MESSAGE" | grep -Eq "^Merge (remote-tracking|remote|tracking)? ?branch '(origin\/)?chore\/bump-([0-9]+\.[0-9]+\.[0-9]+)'.*$"; then
-            VERSION=$(echo "$COMMIT_MESSAGE" | sed -En "s/^Merge.*branch '(origin\/)?chore\/bump-([^']+)'.*$/\2/p")
+          REGEX="^Merge (remote-tracking|remote|tracking)? ?branch '(origin\/)?chore\/bump-([0-9]+\.[0-9]+\.[0-9]+)'.*|.*chore\(bump\) *.* to ([0-9]+\.[0-9]+\.[0-9]+)$"
+
+          if echo -n "$COMMIT_MESSAGE" | grep -Eq "$REGEX"; then
+            VERSION=$(echo "$COMMIT_MESSAGE" | sed -En "s/$REGEX/\3\4/p")
 
             RELEASE_NOTES=""
             if [ -f CHANGELOG.md ]; then

diff --git a/gitlab/global/stages/40-delivery/release.yaml b/gitlab/global/stages/40-delivery/release.yaml
@@ -6,8 +6,10 @@ release:
   script:
     - |
       set -eux
-      if echo "$CI_COMMIT_MESSAGE" | grep -Eq "^Merge (remote-tracking|remote|tracking)? ?branch '(origin\/)?chore\/bump-([0-9]+\.[0-9]+\.[0-9]+)'.*$"; then
-          VERSION=$(echo "$CI_COMMIT_MESSAGE" | sed -En "s/^Merge.*branch '(origin\/)?chore\/bump-([^']+)'.*$/\2/p")
+      REGEX="^Merge (remote-tracking|remote|tracking)? ?branch '(origin\/)?chore\/bump-([0-9]+\.[0-9]+\.[0-9]+)'.*$"
+
+      if echo "$CI_COMMIT_MESSAGE" | grep -Eq "$REGEX"; then
+          VERSION=$(echo "$CI_COMMIT_MESSAGE" | sed -En "s/$REGEX/\3/p")
 
           RELEASE_NOTES=""
           if [ -f CHANGELOG.md ]; then