Merge pull request #512 from chinapandaman/PPF-511

PPF-511: protect master branch from bump version directly
chinapandaman · Feb 17, 2024 · d89ca3b · d89ca3b
2 parents e8ab397 + dcd08a1
commit d89ca3b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/scripts/bump_version.py b/scripts/bump_version.py
@@ -3,8 +3,14 @@
 
 import os
 import re
+import sys
 
 if __name__ == "__main__":
+    branch = sys.argv[1]
+    if not branch.startswith("PPF-"):
+        print("Bump version cannot be done on a non-issue branch.")
+        sys.exit(1)
+
     with open("PyPDFForm/__init__.py", encoding="utf8") as f:
         version = re.search(r'__version__ = "(.*?)"', f.read()).group(1)
 

diff --git a/scripts/bump_version.sh b/scripts/bump_version.sh
@@ -2,10 +2,11 @@ if [[ "$VIRTUAL_ENV" == "" ]]; then
   source "./venv/bin/activate"
 fi
 
-python ./scripts/bump_version.py
-
-git add ./PyPDFForm/__init__.py mkdocs.yml
 BRANCH=$(git symbolic-ref HEAD 2>/dev/null)
 BRANCH=${BRANCH##refs/heads/}
-git commit -m "${BRANCH}: bump version"
-git push --set-upstream origin ${BRANCH}
+
+if python ./scripts/bump_version.py ${BRANCH} ; then
+  git add ./PyPDFForm/__init__.py mkdocs.yml
+  git commit -m "${BRANCH}: bump version"
+  git push --set-upstream origin ${BRANCH}
+fi