Fix deploy.py branch handling

This commit is contained in:
jaseg 2021-08-15 14:01:23 +02:00
parent d1e30b2fee
commit 088e9c83e8

View file

@ -14,12 +14,12 @@ if __name__ == '__main__':
subprocess.run(['git', 'worktree', 'add', '--detach', tmpdir], check=True)
try:
subprocess.run(['hugo'], cwd=tmpdir, check=True)
subprocess.run(['git', 'add', '--force', 'public'], check=True)
write_tree = subprocess.run(['git', 'write-tree', '--prefix=public/'], check=True, capture_output=True)
subprocess.run(['git', 'add', '--force', 'public'], cwd=tmpdir, check=True)
write_tree = subprocess.run(['git', 'write-tree', '--prefix=public/'], cwd=tmpdir, check=True, capture_output=True)
tree = write_tree.stdout.strip()
commit = subprocess.run(['git', 'commit-tree', '-p', 'HEAD', '-p', 'refs/heads/deploy', '-m', 'deploy.py auto-commit', tree], check=True, capture_output=True).stdout.strip()
subprocess.run(['git', 'update-ref', '-m', f'deploy.sh update deploy branch to {commit}', 'refs/heads/deploy', commit], check=True)
commit = subprocess.run(['git', 'commit-tree', '-p', 'HEAD', '-p', 'refs/heads/deploy', '-m', 'deploy.py auto-commit', tree], cwd=tmpdir, check=True, capture_output=True).stdout.strip()
subprocess.run(['git', 'update-ref', '-m', f'deploy.sh update deploy branch to {commit}', 'refs/heads/deploy', commit], cwd=tmpdir, check=True)
finally:
subprocess.run(['git', 'worktree', 'remove', '-f', tmpdir], check=True)