From 2dce8d49e19c8797e91ec079fade1860aac71fcb Mon Sep 17 00:00:00 2001
From: Alison Wu <alison@Alisons-MacBook-Pro-5.local>
Date: Thu, 17 Oct 2024 16:18:05 -0400
Subject: [PATCH 1/2] Add tag-check to workflow

---
 .../workflows/build-wheel-release-upload.yml  | 24 ++++++++++++++++---
 news/tag-check-workflow.rst                   | 23 ++++++++++++++++++
 2 files changed, 44 insertions(+), 3 deletions(-)
 create mode 100644 news/tag-check-workflow.rst

diff --git a/.github/workflows/build-wheel-release-upload.yml b/.github/workflows/build-wheel-release-upload.yml
index cac995b..21f5ea5 100644
--- a/.github/workflows/build-wheel-release-upload.yml
+++ b/.github/workflows/build-wheel-release-upload.yml
@@ -4,14 +4,32 @@ on:
   workflow_dispatch:
   push:
     tags:
-      - '*.*.*'
+      - '*'  # Trigger on all tags initially
 
 jobs:
+  tag-check:
+    runs-on: ubuntu-latest
+    outputs:
+      tag_valid: ${{ steps.tag-check.outputs.tag_valid }}
+    steps:
+      - name: Extract and validate tag for (pre)-release
+        id: tag-check
+        run: |
+          TAG_NAME=${GITHUB_REF#refs/tags/}
+
+          # Check if the tag matches the pattern, e.g. 3.1.32 or 0.1.3rc0
+          if [[ "$TAG_NAME" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]] || [[ "$TAG_NAME" =~ ^[0-9]+\.[0-9]+\.[0-9]+rc[0-9]+$ ]]; then
+            echo "tag_valid=true" >> $GITHUB_OUTPUT
+          fi
+
   release:
+    needs: tag-check
+    if: needs.tag-check.outputs.tag_valid == 'true'
     permissions:
       contents: write
     uses: Billingegroup/release-scripts/.github/workflows/_build-wheel-release-upload.yml@v0
     with:
-      project: diffpy.snmf
+      project: {{ project_name }}
     secrets:
-      PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
+      PYPI_TOKEN: {{ "${{ secrets.PYPI_TOKEN }}" }}
+
diff --git a/news/tag-check-workflow.rst b/news/tag-check-workflow.rst
new file mode 100644
index 0000000..2d1c9f2
--- /dev/null
+++ b/news/tag-check-workflow.rst
@@ -0,0 +1,23 @@
+**Added:**
+
+* <news item>
+
+**Changed:**
+
+* Added tag check for release
+
+**Deprecated:**
+
+* <news item>
+
+**Removed:**
+
+* <news item>
+
+**Fixed:**
+
+* <news item>
+
+**Security:**
+
+* <news item>

From f947f1c794fb8e64ad96261ccdb7aa8164892663 Mon Sep 17 00:00:00 2001
From: Alison Wu <alison@Alisons-MacBook-Pro-5.local>
Date: Thu, 17 Oct 2024 16:25:18 -0400
Subject: [PATCH 2/2] fixed add tag-check to workflow

---
 .github/workflows/build-wheel-release-upload.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-wheel-release-upload.yml b/.github/workflows/build-wheel-release-upload.yml
index 21f5ea5..e07714d 100644
--- a/.github/workflows/build-wheel-release-upload.yml
+++ b/.github/workflows/build-wheel-release-upload.yml
@@ -29,7 +29,6 @@ jobs:
       contents: write
     uses: Billingegroup/release-scripts/.github/workflows/_build-wheel-release-upload.yml@v0
     with:
-      project: {{ project_name }}
+      project: diffpy.snmf
     secrets:
-      PYPI_TOKEN: {{ "${{ secrets.PYPI_TOKEN }}" }}
-
+      PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}