potiuk commented on PR #218:
URL: https://github.com/apache/airflow-steward/pull/218#issuecomment-4531836592
Hi @justinmclean — 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: this branch conflicts with `main` after
PR #257 + the injection-guard Pattern 4 work that landed. Could you rebase or
merge `main` in and resolve?
Conflicting files:
- `tools/skill-validator/src/skill_validator/__init__.py` — the
`SOFT_CATEGORIES` frozenset and the surrounding constants block. Main now also
has `INJECTION_GUARD_CATEGORY`, `INJECTION_GUARD_TODO_CATEGORY`, and
`BODY_INLINE_CATEGORY`; your `LOWERCASE_F_FIELD_CATEGORY` should slot in
alongside them, and the resolved set should include all of them (minus
`INJECTION_GUARD_CATEGORY`, which is HARD by design).
- `tools/skill-validator/tests/test_validator.py` — both the import block
and two test sections. Your `TestLowercaseFField` class and main's
`TestValidateBodyInline` / `TestValidateInjectionGuard` are independent
additions; just keep both.
Both conflicts are mechanical (additive on both sides), no semantic
reconciliation needed. Let me know if you'd prefer me to push the resolution to
your branch instead — I have maintainer-edit access if "Allow edits by
maintainers" is enabled.
--
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]
