Skip to content

Migrate apache-steward framework adoption to Apache Magpie#67929

Merged
potiuk merged 2 commits into
apache:mainfrom
potiuk:migrate-to-apache-magpie
Jun 3, 2026
Merged

Migrate apache-steward framework adoption to Apache Magpie#67929
potiuk merged 2 commits into
apache:mainfrom
potiuk:migrate-to-apache-magpie

Conversation

@potiuk
Copy link
Copy Markdown
Member

@potiuk potiuk commented Jun 3, 2026

What

Migrates this repo's framework adoption from apache-steward to Apache Magpie, following the framework's upstream rename (apache/airflow-steward #436#440) and driven by its built-in pre-Magpie → Magpie migration shim.

Renames

Before After
.apache-steward/ (snapshot, gitignored) .apache-magpie/
.apache-steward.lock .apache-magpie.lock
.apache-steward.local.lock (gitignored) .apache-magpie.local.lock
.apache-steward-overrides/ .apache-magpie-overrides/
committed setup-steward skill magpie-setup
framework symlinks (bare names) magpie-* (list-steward-skillsmagpie-list-skills)

Adopter config updated

  • .gitignore — collapsed the per-family symlink lines into a single magpie-* glob, with a !/.../magpie-setup negation so the committed bootstrap stays tracked.
  • .pre-commit-config.yaml — the hook exclusions that named .github/skills/setup-steward/ and .apache-steward-overrides/ now point at the magpie paths (otherwise the license / codespell / markdownlint / lychee hooks fail on the renamed committed skill).
  • .git/hooks/post-checkout comment + README.md / AGENTS.md references.

From now on use /magpie-setup for all framework operations.

The framework name in prose (the "apache-steward framework" heading) is intentionally left for a separate rebrand pass; this PR is the mechanical layout migration.

Generated-by: Claude Code (Opus 4.8)

The framework was renamed apache-steward -> Apache Magpie upstream
(apache/airflow-steward apache#436-apache#440). This migrates the adoption to the new
layout via the framework's pre-Magpie -> Magpie migration shim:

- .apache-steward* -> .apache-magpie* (snapshot, committed lock, overrides dir)
- committed setup-steward skill -> magpie-setup
- framework symlinks re-prefixed to magpie-* (list-steward-skills -> magpie-list-skills)
- .gitignore collapsed to a magpie-* glob with a magpie-setup negation
- .pre-commit-config.yaml hook exclusions updated to the new paths
- post-checkout hook + README/AGENTS references updated

Use /magpie-setup for all framework operations from now on.
@boring-cyborg boring-cyborg Bot added area:dev-tools backport-to-v3-2-test Mark PR with this label to backport to v3-2-test branch labels Jun 3, 2026
/magpie-setup upgrade refreshed the snapshot to airflow-steward main
(09902844de, which includes apache#441) and re-copied the committed bootstrap:
- adopt.md now carries the !/.../magpie-setup gitignore negation (apache#441)
- drops the duplicate SPDX header the license hook had injected (the skill
  is excluded from that hook, so the framework's own header is canonical)
@potiuk potiuk merged commit b947945 into apache:main Jun 3, 2026
277 of 280 checks passed
@potiuk potiuk deleted the migrate-to-apache-magpie branch June 3, 2026 21:07
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Jun 3, 2026

Backport failed to create: v3-2-test. View the failure log Run details

Note: As of Merging PRs targeted for Airflow 3.X
the committer who merges the PR is responsible for backporting the PRs that are bug fixes (generally speaking) to the maintenance branches.

In matter of doubt please ask in #release-management Slack channel.

Status Branch Result
v3-2-test Commit Link

You can attempt to backport this manually by running:

cherry_picker b947945 v3-2-test

This should apply the commit to the v3-2-test branch and leave the commit in conflict state marking
the files that need manual conflict resolution.

After you have resolved the conflicts, you can continue the backport process by running:

cherry_picker --continue

If you don't have cherry-picker installed, see the installation guide.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:dev-tools backport-to-v3-2-test Mark PR with this label to backport to v3-2-test branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants