summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjaseg <git@jaseg.de>2021-08-15 14:01:23 +0200
committerjaseg <git@jaseg.de>2021-08-15 14:01:23 +0200
commit088e9c83e8683f9bfbf694771c128a3cc1d62c50 (patch)
tree8e005ac45e0a1323db5a5344a7b168d445a88fe1
parentd1e30b2fee7aeeb983875867568f68d89a23fa47 (diff)
downloadblog-088e9c83e8683f9bfbf694771c128a3cc1d62c50.tar.gz
blog-088e9c83e8683f9bfbf694771c128a3cc1d62c50.tar.bz2
blog-088e9c83e8683f9bfbf694771c128a3cc1d62c50.zip
Fix deploy.py branch handling
-rw-r--r--deploy.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/deploy.py b/deploy.py
index 053237a..a78649b 100644
--- a/deploy.py
+++ b/deploy.py
@@ -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)