From 6984802315fb4c8a65c3bd80a2cf8447b7ba91cd Mon Sep 17 00:00:00 2001 From: Aaron Carlisle Date: Mon, 9 Sep 2024 19:52:05 -0400 Subject: [PATCH 1/3] User Manual: Remove old files for when deploying This ensures deleted files do not remain on the server and can still be indexed by search engines. Similar to 832a15101c80d91359dc8c98d425342b55f576d2 --- buildbot/worker/doc_manual.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/buildbot/worker/doc_manual.py b/buildbot/worker/doc_manual.py index e7c5387..7e40b75 100755 --- a/buildbot/worker/doc_manual.py +++ b/buildbot/worker/doc_manual.py @@ -216,7 +216,8 @@ def deliver(builder: ManualBuilder) -> None: # Sync html files source_path = f"{builder.build_path}/{doc_format}/{locale}/" dest_path = f"{connect_id}:{version_remote_path}/" - worker.utils.rsync(source_path, dest_path, exclude_paths=[".doctrees"]) + # Exclude zip files so `--delete` does not delete existing archives + worker.utils.rsync(source_path, dest_path, exclude_paths=[".doctrees", ".*zip"], delete=True, delete_path_check=docs_remote_path) # Create links if builder.track_id == "vdev": -- 2.30.2 From 95a7dd51d315dea8ec3b04988882819cb6900970 Mon Sep 17 00:00:00 2001 From: Aaron Carlisle Date: Fri, 27 Sep 2024 00:28:19 -0400 Subject: [PATCH 2/3] Review: Formatting, update comment, improve specificity --- buildbot/worker/doc_manual.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/buildbot/worker/doc_manual.py b/buildbot/worker/doc_manual.py index 7e40b75..ee3256f 100755 --- a/buildbot/worker/doc_manual.py +++ b/buildbot/worker/doc_manual.py @@ -216,8 +216,14 @@ def deliver(builder: ManualBuilder) -> None: # Sync html files source_path = f"{builder.build_path}/{doc_format}/{locale}/" dest_path = f"{connect_id}:{version_remote_path}/" - # Exclude zip files so `--delete` does not delete existing archives - worker.utils.rsync(source_path, dest_path, exclude_paths=[".doctrees", ".*zip"], delete=True, delete_path_check=docs_remote_path) + # Exclude zip files; these get synced with `needs_package_delivery`. + worker.utils.rsync( + source_path, + dest_path, + exclude_paths=[".doctrees", "blender_manual_*.zip"], + delete=True, + delete_path_check=version_remote_path + ) # Create links if builder.track_id == "vdev": -- 2.30.2 From 7c794f7dda851c7e7b3a6c30d1b5a2cc2d491bed Mon Sep 17 00:00:00 2001 From: Aaron Carlisle Date: Fri, 27 Sep 2024 00:32:34 -0400 Subject: [PATCH 3/3] Improve comment --- buildbot/worker/doc_manual.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildbot/worker/doc_manual.py b/buildbot/worker/doc_manual.py index ee3256f..c3ec9d4 100755 --- a/buildbot/worker/doc_manual.py +++ b/buildbot/worker/doc_manual.py @@ -216,7 +216,7 @@ def deliver(builder: ManualBuilder) -> None: # Sync html files source_path = f"{builder.build_path}/{doc_format}/{locale}/" dest_path = f"{connect_id}:{version_remote_path}/" - # Exclude zip files; these get synced with `needs_package_delivery`. + # Exclude packaged download files; these get synced with `needs_package_delivery`. worker.utils.rsync( source_path, dest_path, -- 2.30.2