fix (cd): use git the old fashioned way in cd

bionicles · Dec 26, 2023 · 5ac5375 · 5ac5375
1 parent 04d5e37
commit 5ac5375
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/unix.yml b/.github/workflows/unix.yml
@@ -75,7 +75,9 @@ jobs:
         run: |
           git config --global user.email "bion@atomiclogic.com"
           git config --global user.name "Bion Howard"
-          git commit -am "cd: increment version.py; update readme [skip ci]"
+          git add .
+          git status
+          git commit -m "cd: increment version.py; update readme [skip ci]"
           git push https://github.com/bionicles/tree_plus.git
       # - name: Publish to PyPI
       #   if: steps.test_again.outputs.success == 'true'

diff --git a/tree_plus_src/deploy.py b/tree_plus_src/deploy.py
@@ -180,14 +180,14 @@ def main():
         main_version_py_sink_path = MAIN_VERSION_PY_SOURCE_PATH
     else:
         # dry run: remove the sink files to keep tests honest
-        if os.environ.get("TREE_PLUS_UPDATE_README") == "YES" and os.path.exists(
-            main_readme_sink_path
-        ):
-            os.remove(main_readme_sink_path)
         if os.environ.get("TREE_PLUS_INCREMENT_VERSION") == "YES" and os.path.exists(
             main_version_py_sink_path
         ):
             os.remove(main_version_py_sink_path)
+        if os.environ.get("TREE_PLUS_UPDATE_README") == "YES" and os.path.exists(
+            main_readme_sink_path
+        ):
+            os.remove(main_readme_sink_path)
     # separate concerns since we need to increment, test, then update
     if os.environ.get("TREE_PLUS_INCREMENT_VERSION") == "YES":
         # 1. increment version first, because step 2 will show this version number