relax patch release regex (#3858)

Signed-off-by: Chris Martin <[email protected]>
Co-authored-by: Chris Martin <[email protected]>

.github/workflows/release-rc.yml

@@ -34,7 +34,7 @@ jobs:
           if [[ "$ref" == "master" ]]; then
             [ $(git branch --contains=$sha master | wc -l) -eq 1 ] &&
             [ $(git rev-list --count $sha..master) -le 2 ]
-          elif [[ "$ref" =~ ^patch/v[0-9]+\.[0-9]+\.[0-9]+-patch[0-9]+$ ]]; then
+          elif [[ "$ref" =~ ^patch/v[0-9]+\.[0-9]+\.[0-9]+.*$ ]]; then
             [ $(git branch --contains=$sha "$ref" | wc -l) -eq 1 ] &&
             base_tag=${ref#patch/}
             base_tag=${base_tag%-*}

.github/workflows/release.yml

@@ -48,7 +48,7 @@ jobs:
           git fetch --all
 
           # Check if it's from master branch or a patch branch
-          if [ $(git branch -r --contains=$sha | grep -E "origin/(master|patch/v[0-9]+\.[0-9]+\.[0-9]+-patch[0-9]+)$" | wc -l) -eq 0 ]; then
+          if [ $(git branch -r --contains=$sha | grep -E "origin/(master|patch/v[0-9]+\.[0-9]+\.[0-9]+.*)$" | wc -l) -eq 0 ]; then
             echo "::error::$sha is not in master or any patch branch"
             echo "Branches containing this SHA:"
             git branch -r --contains=$sha