Skip to content

Commit

Permalink
fixv5
Browse files Browse the repository at this point in the history
  • Loading branch information
thommythomaso committed Feb 26, 2024
1 parent 2103640 commit 2d90b87
Showing 1 changed file with 0 additions and 10 deletions.
10 changes: 0 additions & 10 deletions util/deploy.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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]
Expand Down

0 comments on commit 2d90b87

Please sign in to comment.