From 815727244ca7bd58eb992b9322bd75f79c2d2ca3 Mon Sep 17 00:00:00 2001 From: Sergey Degtyar Date: Fri, 3 May 2024 22:58:51 +0300 Subject: [PATCH] app: more interactive release --- release.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/release.py b/release.py index b87aa83..5cd93a2 100644 --- a/release.py +++ b/release.py @@ -39,21 +39,24 @@ def merge(): with open("Syncogram/config.json", "w", encoding="utf-8") as f: json.dump(data, f, ensure_ascii=False, indent=4) + print("---Переключаюсь на Dev ветку---") + os.system("git checkout dev") + time.sleep(3) os.system("git add .") - time.sleep(1) + time.sleep(3) print("---Комичу новую версию---") os.system(f"""git commit -am "Version {NEW_APP_VERSION}" """) - time.sleep(1) + time.sleep(3) print("---Отправляю в dev ветку---") - os.system("git push") + os.system("git push origin dev") time.sleep(3) print("---Переключаюсь на master ветку---") os.system("git checkout master") print("---Скачиваю все изменения из master---") os.system("git pull") time.sleep(3) - print("---Делаю merge dev -> master---") - os.system("git merge dev") + print("---Делаю merge [dev -> master]---") + os.system("git merge dev -m 'Version {NEW_APP_VERSION}'") time.sleep(3) print("---Пушим в мастер ветку---") os.system("git push origin master")