merge upstream develop: lua-nginx-module rc5, reject too-young frontend deps - #27
Merged
Merged
Conversation
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…nd deps take upstream through bb347a3: bump lua-nginx-module to v0.10.32rc5 (resolver_conf_parsing 1.31.6 was already on develop). reject the frontend dependency bumps that arrived younger than the pnpm minimumReleaseAge window (react-intl 12.0.2 published 2026-09-16, markdown-to-jsx 9.10.3 published 2026-09-15): frontend package.json and the lockfile keep the reviewed react-intl 10.1.26 and markdown-to-jsx 9.10.2; the renovate/dependency-updates cron picks each up once it ages past the window. this clears the fail-closed scheduled upstream-sync run.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
clears the fail-closed scheduled upstream-sync run (2026-09-16 08:49): upstream develop moved 5 commits past the reconciled tip
2fcc605a, and the merge conflicted onfrontend/package.json/pnpm-lock.yaml.taken from upstream (
bb347a39)lua-nginx-modulev0.10.32rc4 → v0.10.32rc5 (Dockerfile ARG bump;resolver_conf_parsing1.31.6 was already on develop)rejected per the
minimumReleaseAgepolicyreact-intl10.2.2 → 12.0.2 (a major, published 2026-09-16 02:25Z — hours before the sync run)markdown-to-jsx9.10.2 → 9.10.3 (published 2026-09-15 22:30Z)both are far inside the 7-day supply-chain window;
frontend/package.jsonand the lockfile keep the reviewed versions (react-intl10.1.26,markdown-to-jsx9.10.2). the renovate/dependency-updates cron picks each up once it ages past the window — same handling as the batch rejected with PR #24.validation
frontend manifests/lockfile are byte-identical to develop, so no code path changes; the only content change is one Dockerfile ARG, covered by dockerlint and the image builds.
merge commit — please merge, do not squash/rebase
🤖 Generated with Claude Code