From 2e9e857b7b68a3f5e9b07102e7b243b15428a0ca Mon Sep 17 00:00:00 2001
From: Jonathan Wren <jonathan@nowandwren.com>
Date: Sat, 19 Dec 2020 15:07:45 -0800
Subject: [PATCH] standardize version regex in release pipeline (#1124)

---
 .github/workflows/changelog.yaml | 2 +-
 .github/workflows/release.yaml   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/changelog.yaml b/.github/workflows/changelog.yaml
index 471acb796..ffacd90eb 100644
--- a/.github/workflows/changelog.yaml
+++ b/.github/workflows/changelog.yaml
@@ -35,7 +35,7 @@ jobs:
           if [[ $GITHUB_REF =~ ^refs/tags/ ]]; then
             # This is a tag build (i.e. a release)
             echo '::debug::Release build'
-            if [[ ! $BRANCH =~ ^v[0-9]+(\.[0-9]+){1,2}(-(alpha|beta)(\.[0-9]+)?)?$ ]]; then
+            if [[ ! $BRANCH =~ ^v[0-9]+(\.[0-9]+){1,2}(-(alpha|beta)([0-9]+)?)?$ ]]; then
               echo "::error::Invalid tag format: ${BRANCH}"
               exit 1
             fi
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 67d70065f..b8474967d 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -3,7 +3,7 @@ on:
   workflow_dispatch:
     inputs:
       version:
-        description: 'Version (e.g. v2.5 or v2.5.1-beta)'
+        description: 'Version (e.g. v2.5, v2.5.1-beta, v2.6-beta2)'
         required: true
 
 jobs:
@@ -15,7 +15,7 @@ jobs:
       run: |
         JRNL_VERSION="${{ github.event.inputs.version }}"
         echo "::debug::version: $JRNL_VERSION"
-        if [[ ! $JRNL_VERSION =~ ^v[0-9]+(\.[0-9]+){1,2}(-(alpha|beta)(\.[0-9]+)?)?$ ]]; then
+        if [[ ! $JRNL_VERSION =~ ^v[0-9]+(\.[0-9]+){1,2}(-(alpha|beta)([0-9]+)?)?$ ]]; then
           echo
           echo "::error::Bad version"
           echo