Skip to content

refactor(fleet): use shared derived repo validation#27

Merged
JSONbored merged 2 commits into
mainfrom
codex/fleet-derived-validator-shims
Apr 30, 2026
Merged

refactor(fleet): use shared derived repo validation#27
JSONbored merged 2 commits into
mainfrom
codex/fleet-derived-validator-shims

Conversation

@JSONbored
Copy link
Copy Markdown
Owner

Summary

  • Replaces the copied derived-repo validation logic with the shared aio-fleet shim
  • Bumps reusable AIO workflow callers to aio-fleet@6cb527a4cccd624ad73447b6b73cda9b56b4c9c7

What changed

  • scripts/validate-derived-repo.sh now delegates to aio-fleet validate-derived
  • Generated workflow callers now reference the fleet SHA that contains the centralized validator

Why

  • Keeps derived-repo validation behavior centralized in aio-fleet
  • Reduces duplicated validator logic across the active AIO fleet while preserving the existing script entrypoint

Validation

  • python3 scripts/validate-template.py --all
  • bash scripts/validate-derived-repo.sh .
  • git diff --check
  • actionlint -shellcheck '' -pyflakes '' -ignore 'SC2129' .github/workflows/*.yml
  • python -m aio_fleet verify-caller --repo unraid-aio-template --repo-path /Users/shadowbook/Documents/unraid-aio-template --ref 6cb527a4cccd624ad73447b6b73cda9b56b4c9c7

Copy link
Copy Markdown

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

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: 16a403d7dc

ℹ️ 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 on lines +12 to +13
if python3 -c "import aio_fleet" >/dev/null 2>&1; then
exec python3 -m aio_fleet.cli "${args[@]}"
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P1 Badge Restore standalone validation fallback

This change makes scripts/validate-derived-repo.sh fail in a normal checkout unless aio_fleet is preinstalled or a sibling aio-fleet repo exists, which is a regression from the previous self-contained validator behavior. In this repository as committed, running bash scripts/validate-derived-repo.sh . exits with the new error path, so local validation (and any CI job that only installs this repo’s own dev deps) breaks immediately instead of validating derived-repo contents.

Useful? React with 👍 / 👎.

@JSONbored JSONbored merged commit 212d642 into main Apr 30, 2026
11 checks passed
@JSONbored JSONbored deleted the codex/fleet-derived-validator-shims branch April 30, 2026 19:17
Copy link
Copy Markdown

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

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: 79accd61e4

ℹ️ 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 on lines +12 to +13
if python3 -c "import aio_fleet" >/dev/null 2>&1; then
exec python3 -m aio_fleet.cli "${args[@]}"
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P2 Badge Honor AIO_FLEET_PATH before importing installed aio_fleet

The early import aio_fleet check immediately execs the installed module and never reaches the AIO_FLEET_PATH fallback logic, so a stale or partial site-packages install can break validation even when a valid local checkout is explicitly provided. In practice, if PYTHONPATH contains an aio_fleet package without aio_fleet.cli, this path exits with No module named aio_fleet.cli instead of using the checkout discovered later in the script, which defeats the documented local-override behavior.

Useful? React with 👍 / 👎.

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