From 75a89d0e8e5b84657479d04d7944d2083d17a65b Mon Sep 17 00:00:00 2001 From: JSONbored <49853598+JSONbored@users.noreply.github.com> Date: Thu, 30 Apr 2026 16:15:59 -0600 Subject: [PATCH] fix(fleet): sync release shim path fallback --- .github/workflows/build.yml | 2 +- .github/workflows/check-upstream.yml | 2 +- .github/workflows/publish-release.yml | 2 +- .github/workflows/release.yml | 2 +- scripts/release.py | 10 +++++++--- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d6ebfe2..af861e4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -64,7 +64,7 @@ concurrency: jobs: aio-build: - uses: JSONbored/aio-fleet/.github/workflows/aio-build.yml@c2c7c9a58496ce5c65e8952dc57fe455f8547833 + uses: JSONbored/aio-fleet/.github/workflows/aio-build.yml@294c30f6f88dcabf2ef7467f0def0ad4e3b18b74 permissions: contents: read packages: write diff --git a/.github/workflows/check-upstream.yml b/.github/workflows/check-upstream.yml index 5eb668d..ed818a1 100644 --- a/.github/workflows/check-upstream.yml +++ b/.github/workflows/check-upstream.yml @@ -14,7 +14,7 @@ concurrency: jobs: check-upstream: - uses: JSONbored/aio-fleet/.github/workflows/aio-check-upstream.yml@c2c7c9a58496ce5c65e8952dc57fe455f8547833 + uses: JSONbored/aio-fleet/.github/workflows/aio-check-upstream.yml@294c30f6f88dcabf2ef7467f0def0ad4e3b18b74 permissions: contents: write pull-requests: write diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index 0c9278d..dd62d8d 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -8,7 +8,7 @@ permissions: jobs: publish-release: - uses: JSONbored/aio-fleet/.github/workflows/aio-publish-release.yml@c2c7c9a58496ce5c65e8952dc57fe455f8547833 + uses: JSONbored/aio-fleet/.github/workflows/aio-publish-release.yml@294c30f6f88dcabf2ef7467f0def0ad4e3b18b74 permissions: actions: read contents: write diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 44c100e..1bc39a1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,7 +8,7 @@ permissions: jobs: prepare-release: - uses: JSONbored/aio-fleet/.github/workflows/aio-prepare-release.yml@c2c7c9a58496ce5c65e8952dc57fe455f8547833 + uses: JSONbored/aio-fleet/.github/workflows/aio-prepare-release.yml@294c30f6f88dcabf2ef7467f0def0ad4e3b18b74 permissions: contents: write pull-requests: write diff --git a/scripts/release.py b/scripts/release.py index 1d28961..aa8db95 100755 --- a/scripts/release.py +++ b/scripts/release.py @@ -1,17 +1,20 @@ #!/usr/bin/env python3 from __future__ import annotations +import os import sys from pathlib import Path def _add_local_aio_fleet() -> None: repo_root = Path(__file__).resolve().parents[1] + configured_path = os.environ.get("AIO_FLEET_PATH") for candidate in ( + Path(configured_path).expanduser() / "src" if configured_path else None, repo_root / ".aio-fleet" / "src", repo_root.parent / "aio-fleet" / "src", ): - if candidate.exists(): + if candidate and candidate.exists(): sys.path.insert(0, str(candidate)) return @@ -23,8 +26,9 @@ def main() -> int: except ModuleNotFoundError as exc: raise SystemExit( "aio_fleet.release is required. Run from the standard workspace with " - "../aio-fleet present, or let the reusable aio-fleet workflows check " - "out .aio-fleet before invoking this shim." + "../aio-fleet present, set AIO_FLEET_PATH to a local aio-fleet checkout, " + "or let the reusable aio-fleet workflows check out .aio-fleet before " + "invoking this shim." ) from exc return int(