Skip to content

fix: preserve updated submodules during sync - #1415

Merged
ErikBjare merged 4 commits into
masterfrom
build/apply-tauri-server-sync
Aug 31, 2026
Merged

ErikBjare merged 4 commits into
masterfrom
build/apply-tauri-server-sync

Conversation

@ErikBjare

Copy link
Copy Markdown
Member

Summary

  • initialize aw-tauri and aw-server-rust only when their checkouts are missing
  • preserve an aw-tauri revision just advanced by make update-submodules before reading its lock
  • retain protection against Git walking up from an empty submodule directory into the superproject

Validation

  • python3 -m pytest scripts/tests -q (36 passed)
  • Python 3.9 compile check
  • advanced aw-tauri, ran make sync-tauri-server, and verified its revision was preserved while aw-server-rust moved to the new locked SHA
  • git diff --check

This fixes a follow-up interaction found while applying the newly merged synchronization workflow from #1414.

@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Aug 31, 2026 •

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-08-31T17:59:33.610064Z 1d0d09e New commits
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@ErikBjare

Copy link
Copy Markdown
Member Author

@greptileai review

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 93a893397d

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread scripts/check_tauri_server.py Outdated
@greptile-apps

greptile-apps Bot commented Aug 31, 2026 •

Copy link
Copy Markdown
Contributor

Greptile Summary

This PR preserves updated submodule revisions during synchronization while verifying that existing checkouts are managed by the superproject.

  • Initializes aw-tauri and aw-server-rust only when their checkouts are missing.
  • Rejects standalone and old-form embedded Git checkouts before synchronization.
  • Checks tracked modifications before moving the server submodule and expands regression coverage.

Confidence Score: 5/5

The PR appears safe to merge.

No blocking failure remains; the current ownership validation resolves both previously reported standalone-checkout rewrite paths.

Important Files Changed

Filename Overview
scripts/check_tauri_server.py Adds exact checkout-root and Git-directory ownership validation, preserves initialized submodules, and safely synchronizes the locked server revision.
scripts/tests/test_check_tauri_server.py Covers exact repository-root detection, rejection of unrelated and old-form checkouts, and dirty matching-revision behavior.

Reviews (4): Last reviewed commit: "fix: reject unmanaged old-form checkouts" | Re-trigger Greptile

Comment thread scripts/check_tauri_server.py Outdated
@ErikBjare

Copy link
Copy Markdown
Member Author

@greptileai review

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: b34c6bc701

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread scripts/check_tauri_server.py Outdated
@ErikBjare

Copy link
Copy Markdown
Member Author

@greptileai review

Comment thread scripts/check_tauri_server.py Outdated
@ErikBjare

Copy link
Copy Markdown
Member Author

@greptileai review

@ErikBjare
ErikBjare merged commit c4bf10c into master Aug 31, 2026
19 checks passed
@ErikBjare
ErikBjare deleted the build/apply-tauri-server-sync branch August 31, 2026 18:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant