potiuk commented on PR #163:
URL: https://github.com/apache/airflow-steward/pull/163#issuecomment-4531836762
Hi @andreahlert — heads-up first: `main` was just refreshed with
pinned-action SHA bumps for `actions/cache`, `github/codeql-action`,
`zizmorcore/zizmor-action`, and `astral-sh/setup-uv`. Those bumps had been
blocked by a schema bug in `.github/dependabot.yml` (the `github-actions`
ecosystem rejected `semver-{major,minor,patch}-days` cooldown keys), which is
now fixed — see #257. A rebase will pull the new SHAs into your branch as a
side effect; that's expected.
Now the actual reason for this ping: small conflict in `docs/modes.md` after
the latest `main`:
- Your branch updates the Triage row to mention `release-management` with
count `12 + 4 proposed`.
- Main now has the Triage row reading `experimental (pr-management,
issue-management, contributor-nomination) | 13`.
The resolution is to keep both: add `release-management` to your status
string after `contributor-nomination`, and update the count to e.g. `13 + 4
proposed` (or whatever the right math is after `contributor-nomination`
landed). Could you rebase or merge `main` in and reconcile? Happy to push the
fix to your branch myself if you'd prefer — let me know.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
