Skip to content

Fix issue when file is deleted in archive script #793

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
WilliamJamieson merged 2 commits into from
Jan 8, 2026
Merged

Fix issue when file is deleted in archive script #793

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b5f750
Fix issue when file is deleted
WilliamJamieson Jan 6, 2026
5c6dfc0
update gitignore
WilliamJamieson Jan 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,3 +144,6 @@ _version.py

# uv
uv.lock

# archive script default write directory
archive_dump/
5 changes: 3 additions & 2 deletions scripts/archive.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def _repo_branch(repo: Repo, hexsha: str) -> Generator[None, None, None]:

if file_diffs:
for file_diff in file_diffs:
if file_diff.a_path.startswith("latest/"):
if file_diff.a_path.startswith("latest/") or file_diff.a_path.startswith("src/rad/resources/"):
changed_latest.append(file_diff.a_path)

# Only want to change the latest files during this context the other changes should be preserved
Expand All @@ -71,6 +71,7 @@ def _repo_branch(repo: Repo, hexsha: str) -> Generator[None, None, None]:

# Checkout checkout the latest files from hexshaw in the primary repo.
repo.git.checkout(hexsha, "--", "latest")
repo.git.checkout(hexsha, "--", "src/rad/resources")

# Apply the stashed changes back to the working directory
if file_diffs:
Expand Down Expand Up @@ -128,8 +129,8 @@ def _diff_repo(
verbose=True,
)["archive_schemas"]

print("Generating archive files for the main branch...")
with _repo_branch(repo, hexsha):
print("Generating archive files for the current staged state...")
main_schemas = dump(
base_dir, super_schema=False, archive_json=False, archive_txt=False, archive_yaml=False, verbose=True
)["archive_schemas"]
Expand Down
Loading