From 0e09cd96edd331d2d4065f9c85933cf70bd23dee Mon Sep 17 00:00:00 2001 From: jaseg Date: Sun, 17 May 2026 13:46:09 +0200 Subject: [PATCH] Add new deploy script --- config.toml | 1 + deploy.py | 33 --------------------------------- deploy.sh | 4 ++++ 3 files changed, 5 insertions(+), 33 deletions(-) delete mode 100644 deploy.py create mode 100755 deploy.sh diff --git a/config.toml b/config.toml index c4ddcbe..fc34af8 100644 --- a/config.toml +++ b/config.toml @@ -3,6 +3,7 @@ languageCode = "en-us" title = "Home" copyright = "Jan Sebastian Götte" theme = "conspiracy" +enableRobotsTXT = true [params] fediverse_account = "@jaseg@chaos.social" diff --git a/deploy.py b/deploy.py deleted file mode 100644 index f0cab5c..0000000 --- a/deploy.py +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env python3 - -import os -import tempfile -import subprocess -from pathlib import Path - -if __name__ == '__main__': - with tempfile.TemporaryDirectory() as tmpdir: - pagefind = Path('~/.cargo/bin/pagefind').expanduser() - pagefind = str(pagefind) if pagefind.is_file() else 'pagefind' - - current_branch = subprocess.run(['git', 'symbolic-ref', '-q', 'HEAD'], check=False, capture_output=True).stdout.strip() - if current_branch == 'refs/heads/deploy': - raise SystemError('This script cannot be run from the deploy branch (run from main instead)') - - subprocess.run(['git', 'worktree', 'add', '--detach', tmpdir], check=True) - try: - env = dict(os.environ) - env['PATH'] = f'{Path("hack").absolute()}:{env["PATH"]}' - hugo = os.environ.get('HUGO', 'hugo') - subprocess.run([hugo], cwd=tmpdir, check=True, env=env) - subprocess.run([pagefind, '--site', 'public'], cwd=tmpdir, check=True, env=env) - 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], 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) - - subprocess.run(['git', 'push', 'git@git.jaseg.de:blog.git', 'deploy'], cwd=tmpdir, check=True) - finally: - subprocess.run(['git', 'worktree', 'remove', '-f', tmpdir], check=True) diff --git a/deploy.sh b/deploy.sh new file mode 100755 index 0000000..4679b53 --- /dev/null +++ b/deploy.sh @@ -0,0 +1,4 @@ +set -e +hugo +~/.cargo/bin/pagefind --site public +rsync -avP public/ wendelstein:/var/www/jaseg.de/