diff --git a/util/deploy.py b/util/deploy.py index 409f0fa6..97cb8cb0 100644 --- a/util/deploy.py +++ b/util/deploy.py @@ -47,10 +47,6 @@ deploy_msg = f'{current_msg}\n-----\n\nDeployed from {current_hash}' print(f'Deploy commit message:\n{deploy_msg}') -## checkout current working branch -#os.popen(f'{GIT_CHECKOUT_CMD} {current_branch}') -#time.sleep(0.5) - # spawn or switch to deploy branch if last_deploy_hash == '': # create new deploy branch @@ -61,15 +57,9 @@ time.sleep(2) # merge feature into deploy branch -print('\n.\n.\n.\n.\n.\n.\n.\n') os.popen(f'{GIT_MERGE_SQUASH_CMD} {ORIGIN}/{current_branch}') time.sleep(0.5) -print('\n.\n.\n.\n.\n.\n.\n.\n') -print(os.popen('git status').read()) - -sys.exit(0) - # selectively deactivate gitignore to check in generated files with open('target/rtl/.gitignore', 'r', encoding='utf-8') as f: content = f.read().split('\n')[:-1]