Skip to content

ci(renovate): fix lock file maintenance author, schedule and scope - #8516

Merged
matthewelwell merged 3 commits into
mainfrom
ci/renovate-git-author
Sep 15, 2026
Merged

matthewelwell merged 3 commits into
mainfrom
ci/renovate-git-author

Conversation

@matthewelwell

@matthewelwell matthewelwell commented Sep 14, 2026

Copy link
Copy Markdown
Contributor

Thanks for submitting a PR! Please check the boxes below:

  • I have read the Contributing Guide.
  • I have added information to docs/ if required so people know about the feature.
  • I have filled in the "Changes" section below.
  • I have filled in the "How did you test this code" section below.

Changes

Contributes to #7697

Three fixes to lock file maintenance:

  • gitIgnoredAuthors — our docs-artefacts workflow pushes to Renovate branches under its own address, which makes Renovate treat those branches as hand-edited and refuse to touch them again. (The related RENOVATE_GIT_AUTHOR variable had the app ID where the bot user ID should be; already fixed in repo settings.)
  • Widened the Monday window, before 4ambefore 9am. GitHub delays the 03:00 cron by ~20 minutes, so we had under 40 minutes of headroom and a miss costs a full week.
  • Fixed the PR scope. One branch covers all four workspaces, but the scope is taken from whichever upgrade sorts first — hence deps: lock file maintenance #8518 being titled deps(mcp) while touching api, docs, frontend and mcp. Now deps: Lock file maintenance.

How did you test this code?

renovate-config-validator passes. The gitAuthor fix is confirmed working — with it in place Renovate rebased renovate/lock-file-maintenance instead of skipping it as edited.

The scope rule has to sit last in packageRules: packageRules are applied again after the updateType config, so from anywhere earlier the per-path rules re-apply and win.

🤖 Generated with Claude Code

@matthewelwell
matthewelwell requested a review from a team as a code owner September 14, 2026 09:39
@matthewelwell
matthewelwell requested review from germangarces and removed request for a team September 14, 2026 09:39
@vercel

vercel Bot commented Sep 14, 2026

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

3 Skipped Deployments
Project Deployment Actions Updated
docs Ignored Ignored Preview Sep 14, 2026 4:39pm UTC
flagsmith-frontend-preview Ignored Ignored Preview Sep 14, 2026 4:39pm UTC
flagsmith-frontend-staging Ignored Ignored Preview Sep 14, 2026 4:39pm UTC

Request Review

@coderabbitai

coderabbitai Bot commented Sep 14, 2026

Copy link
Copy Markdown

Review Change StackReview Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: ASSERTIVE

Plan: Advanced

Run ID: 3574c202-75cf-4f44-8ec4-503ae560ac7e

📥 Commits

Reviewing files that changed from the base of the PR and between 6890946 and cd723a5.

📒 Files selected for processing (1)
  • renovate.json

Included review availability: Your plan provides up to 8 included reviews per hour; 6 remain after this review.


📝 Walkthrough

Walkthrough

The Renovate configuration now ignores commits from flagsmith-engineering[bot]@users.noreply.github.com``. Lock-file maintenance now runs before 9am on Mondays. The lock-file maintenance rule applies to all workspaces and sets semanticCommitScope to an empty string.

Priority: ⬇️ Low

Estimated code review effort: 1 (Trivial) | ~5 minutes

Merge Risk: ⚪ Minimal · up to cd723

The Renovate configuration has no established merge-blocking defect.


Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@github-actions

github-actions Bot commented Sep 14, 2026

Copy link
Copy Markdown
Contributor

Docker builds report

Image Build Status Security report
ghcr.io/flagsmith/flagsmith-api:pr-8516 Finished ✅ Results
ghcr.io/flagsmith/flagsmith-e2e:pr-8516 Finished ✅ Skipped
ghcr.io/flagsmith/flagsmith-frontend:pr-8516 Finished ✅ Results
ghcr.io/flagsmith/flagsmith-api:pr-8516 Finished ✅ Results
ghcr.io/flagsmith/flagsmith:pr-8516 Finished ✅ Results
ghcr.io/flagsmith/flagsmith-private-cloud:pr-8516 Finished ✅ Results

@github-actions github-actions Bot added the ci-cd Build, test and deployment related label Sep 14, 2026
@github-actions

github-actions Bot commented Sep 14, 2026

Copy link
Copy Markdown
Contributor
✅ private-cloud · depot-ubuntu-latest-16 — run #20441 (attempt 1)

Playwright Test Results (private-cloud - depot-ubuntu-latest-16)

passed  2 passed

Details

stats  2 tests across 2 suites
duration  49.1 seconds
commit  cd723a5
info  🔄 Run: #20441 (attempt 1)

🗂️ Previous results
✅ private-cloud · depot-ubuntu-latest-arm-16 — run #20441 (attempt 1)

Playwright Test Results (private-cloud - depot-ubuntu-latest-arm-16)

passed  3 passed

Details

stats  3 tests across 3 suites
duration  37.7 seconds
commit  cd723a5
info  🔄 Run: #20441 (attempt 1)

✅ oss · depot-ubuntu-latest-arm-16 — run #20441 (attempt 1)

Playwright Test Results (oss - depot-ubuntu-latest-arm-16)

passed  1 passed

Details

stats  1 test across 1 suite
duration  43.1 seconds
commit  cd723a5
info  🔄 Run: #20441 (attempt 1)

✅ oss · depot-ubuntu-latest-16 — run #20441 (attempt 1)

Playwright Test Results (oss - depot-ubuntu-latest-16)

passed  1 passed

Details

stats  1 test across 1 suite
duration  34.7 seconds
commit  cd723a5
info  🔄 Run: #20441 (attempt 1)

✅ private-cloud · depot-ubuntu-latest-arm-16 — run #20440 (attempt 1)

Playwright Test Results (private-cloud - depot-ubuntu-latest-arm-16)

passed  4 passed

Details

stats  4 tests across 4 suites
duration  36.8 seconds
commit  f6354ff
info  🔄 Run: #20440 (attempt 1)

✅ oss · depot-ubuntu-latest-arm-16 — run #20440 (attempt 1)

Playwright Test Results (oss - depot-ubuntu-latest-arm-16)

passed  1 passed

Details

stats  1 test across 1 suite
duration  43.2 seconds
commit  f6354ff
info  🔄 Run: #20440 (attempt 1)

✅ private-cloud · depot-ubuntu-latest-16 — run #20438 (attempt 1)

Playwright Test Results (private-cloud - depot-ubuntu-latest-16)

passed  1 passed

Details

stats  1 test across 1 suite
duration  55.8 seconds
commit  e7f04dd
info  🔄 Run: #20438 (attempt 1)

✅ private-cloud · depot-ubuntu-latest-16 — run #20440 (attempt 1)

Playwright Test Results (private-cloud - depot-ubuntu-latest-16)

passed  1 passed

Details

stats  1 test across 1 suite
duration  32.1 seconds
commit  f6354ff
info  🔄 Run: #20440 (attempt 1)

✅ oss · depot-ubuntu-latest-16 — run #20440 (attempt 1)

Playwright Test Results (oss - depot-ubuntu-latest-16)

passed  1 passed

Details

stats  1 test across 1 suite
duration  34.7 seconds
commit  f6354ff
info  🔄 Run: #20440 (attempt 1)

✅ private-cloud · depot-ubuntu-latest-arm-16 — run #20438 (attempt 1)

Playwright Test Results (private-cloud - depot-ubuntu-latest-arm-16)

passed  2 passed

Details

stats  2 tests across 2 suites
duration  38.2 seconds
commit  e7f04dd
info  🔄 Run: #20438 (attempt 1)

✅ private-cloud · depot-ubuntu-latest-16 — run #20439 (attempt 1)

Playwright Test Results (private-cloud - depot-ubuntu-latest-16)

passed  3 passed

Details

stats  3 tests across 3 suites
duration  33.8 seconds
commit  6890946
info  🔄 Run: #20439 (attempt 1)

✅ oss · depot-ubuntu-latest-arm-16 — run #20439 (attempt 1)

Playwright Test Results (oss - depot-ubuntu-latest-arm-16)

passed  1 passed

Details

stats  1 test across 1 suite
duration  40.2 seconds
commit  6890946
info  🔄 Run: #20439 (attempt 1)

@github-actions

github-actions Bot commented Sep 14, 2026

Copy link
Copy Markdown
Contributor

Visual Regression

19 screenshots compared. See report for details.
View full report

@matthewelwell
matthewelwell marked this pull request as draft September 14, 2026 11:04
@matthewelwell
matthewelwell marked this pull request as ready for review September 14, 2026 16:18
@github-actions github-actions Bot added ci-cd Build, test and deployment related and removed ci-cd Build, test and deployment related labels Sep 14, 2026
Renovate commits as the flagsmith-engineering GitHub App
(216534828+flagsmith-engineering[bot]@users.noreply.github.com), but
RENOVATE_GIT_AUTHOR was set to a noreply address carrying user ID
1414362, which belongs to an unrelated account. isBranchModified()
strips gitAuthorEmail from the set of authors seen on a branch and
treats anything left over as a human edit, so every branch Renovate
created looked externally modified on the next run. That silently
blocked all rebases and left PR-less branches permanently stuck.

The variable itself is fixed in repo settings. This adds
gitIgnoredAuthors so the docs-artefacts workflow, which pushes to
Renovate branches under a third address, does not reintroduce the same
false positive.

Also widens the lock file maintenance window. GitHub delays the 03:00
UTC cron by 18-22 minutes, leaving under 40 minutes of headroom against
a 4am cutoff, and a miss costs a full week.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
@github-actions github-actions Bot added ci-cd Build, test and deployment related and removed ci-cd Build, test and deployment related labels Sep 14, 2026
@github-actions github-actions Bot added ci-cd Build, test and deployment related and removed ci-cd Build, test and deployment related labels Sep 14, 2026
One lock file maintenance branch covers api, docs, frontend and mcp, but
semanticCommitScope is a scalar taken from whichever upgrade sorts first,
so the PR came out titled deps(mcp) while touching all four.

Moving the rule last and clearing the scope gives "deps: Lock file
maintenance". It has to be last because packageRules are applied again
after the updateType config (flatten.ts), so from its old position the
per-path rules below re-applied and won.
@matthewelwell matthewelwell changed the title ci(renovate): fix gitAuthor and widen lock file maintenance window ci(renovate): fix lock file maintenance author, schedule and scope Sep 14, 2026
@github-actions github-actions Bot added ci-cd Build, test and deployment related and removed ci-cd Build, test and deployment related labels Sep 14, 2026
Comment thread renovate.json Outdated
@github-actions github-actions Bot added ci-cd Build, test and deployment related and removed ci-cd Build, test and deployment related labels Sep 14, 2026

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1


ℹ️ Review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: ASSERTIVE

Plan: Advanced

Run ID: 77073941-9ace-45b8-8ed9-bc304e07724f

📥 Commits

Reviewing files that changed from the base of the PR and between 9656c23 and 6890946.

📒 Files selected for processing (1)
  • renovate.json

Included review availability: Your plan provides up to 8 included reviews per hour; 7 remain after this review.

Comment thread renovate.json
@matthewelwell
matthewelwell merged commit f95f709 into main Sep 15, 2026
26 checks passed
@matthewelwell
matthewelwell deleted the ci/renovate-git-author branch September 15, 2026 08:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ci-cd Build, test and deployment related

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants