changing workflows

Author: TLSDC

.github/workflows/pypi.yml

@@ -2,7 +2,11 @@ name: Build and Publish
 # based on official doc
 # https://packaging.python.org/en/latest/guides/publishing-package-distribution-releases-using-github-actions-ci-cd-workflows/
 
-on: [push, workflow_dispatch]
+on:
+  push:
+    tags:
+      - 'v*'
+  workflow_dispatch:
 
 jobs:
     build:
@@ -31,7 +35,7 @@ jobs:
 
     publish-to-pypi:
       name: Publish to PyPI
-      if: startsWith(github.ref, 'refs/tags/')  # only publish to PyPI on tag pushes # tweak so it doesnt publish all tags
+      if: startsWith(github.ref, 'refs/tags/') && contains(github.ref_name, 'v') && github.ref_name matches '^v[0-9]+\.[0-9]+\.[0-9]+(\.dev[0-9]+)?$' 
       needs:
         - build
       runs-on: ubuntu-22.04

.github/workflows/readthedocs.yml

@@ -40,7 +40,9 @@ jobs:
       run: |
         git config --global user.name "github-actions[bot]"
         git config --global user.email "github-actions[bot]@users.noreply.github.com"
-        git checkout -b generated-docs || git checkout generated-docs
+        git checkout -b generated-docs
         git add .
         git commit -m "Update docs for version $GITHUB_REF_NAME [skip ci]" || echo "No changes to commit"
         git push origin generated-docs --force
+        git tag docs/$GITHUB_REF_NAME
+        git push origin docs/$GITHUB_REF_NAME