Skip to content

More Renovate updates#1349

Merged
ecraig12345 merged 9 commits into
mainfrom
renovate-revert
Jul 24, 2026
Merged

More Renovate updates#1349
ecraig12345 merged 9 commits into
mainfrom
renovate-revert

Conversation

@ecraig12345

@ecraig12345 ecraig12345 commented Jul 22, 2026

Copy link
Copy Markdown
Member

Revert workaround for yarn resolutions issue fixed in renovatebot/renovate#44776.

Add a customTagActions preset (included in default) which helps Renovate reference action tags like microsoft/beachball/actions/check-for-modified-files@check-for-modified-files_v3. Otherwise you get weird PRs like Update microsoft/beachball digest to 826cebb...

Re-enable git tag creation for renovate presets, but add notes about presets where it won't work due to extends references to other in-repo presets. Accordingly, move most settings from the default preset into a new base preset (no in-repo references) and update default to extend that.

Fix the full dry run serverConfig.ts to omit presets which extend other local presets. To retain coverage, this required splitting the two presets which had extends references to local presets as well as other settings: default other settings moved to a new preset base, and beachball other settings moved back into beachballPostUpgrade.

Copilot AI review requested due to automatic review settings July 22, 2026 21:58

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

Removes the obsolete Yarn resolutions workaround after Renovate 43.276.0 fixed the underlying parsing bug.

Changes:

  • Removes the workaround from the default preset and generated documentation.
  • Updates the existing patch change description.

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.

File Description
renovate/README.md Removes obsolete configuration documentation.
renovate/presets/default.json Re-enables normal processing of Yarn resolutions.
change/@microsoft-m365-renovate-config-dddec310-1795-4750-93bd-5cc0e40e07a7.json Updates the release note.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@ecraig12345 ecraig12345 changed the title Revert renovate yarn resolutions workaround More Renovate updates Jul 23, 2026
Copilot AI review requested due to automatic review settings July 23, 2026 02:54

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

Copilot reviewed 21 out of 21 changed files in this pull request and generated 3 comments.

Comments suppressed due to low confidence (1)

scripts/beachballConfigHelpers.ts:35

  • This builds tags from the full npm package name, so the release will create @microsoft/m365-renovate-config_v3.1.0 and @microsoft/m365-renovate-config_v3, while the new documentation tells consumers to use renovate_v3.1.0 and renovate_v3. Pass the intended renovate tag prefix here and update the existing getGitTag test, which still expects null and will currently fail.

Comment thread renovate/presets/customTagActions.json Outdated
Comment thread renovate/README.md Outdated
Comment thread renovate/scripts/utils/types.ts Outdated
Copilot AI review requested due to automatic review settings July 23, 2026 02:58

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

Copilot reviewed 21 out of 21 changed files in this pull request and generated 1 comment.

Comments suppressed due to low confidence (4)

scripts/beachballConfigHelpers.ts:34

  • This passes the full package name into the generic tag helper, producing @microsoft/m365-renovate-config_v1.2.3 rather than the advertised renovate_v1.2.3. The new test on lines 37–41 therefore fails, and publishing would create unusable tag names. Use the documented renovate prefix here.
    renovate/presets/customTagActions.json:12
  • These patterns are not terminated after the version capture, so an unsupported ref such as should-release_v3-beta still matches by capturing only should-release_v3. Renovate can then process and rewrite a ref that the versioning rule is intended to reject. Require whitespace or end-of-input after the captured version in both patterns.
        "uses:\\s+(?<depName>(?<packageName>[^/\\s]+/[^/\\s]+)/[^@\\s]+)@(?<currentDigest>[0-9a-f]{40})[ \t]+#\\s*(?<currentValue>[\\w.-]+_v\\d+(?:\\.\\d+){0,2})",
        "uses:\\s+(?<depName>(?<packageName>[^/\\s]+/[^/\\s]+)/[^@\\s]+)@(?<currentValue>[\\w.-]+_v\\d+(?:\\.\\d+){0,2})"

renovate/README.md:1045

  • This limitation contradicts the second matchStrings entry and the new tag-ref tests: direct <name>_v... refs are handled by the custom manager, while the built-in manager is disabled for them. Update this text so consumers do not incorrectly assume direct tags are unsupported.
- Only matches actions pinned to a full 40-character commit digest with a comment of the form `# <name>_v<major>[.<minor>[.<patch>]]`. Refs pinned directly to a tag/branch, or without the version comment, are left to the built-in manager.

renovate/scripts/utils/types.ts:98

  • Correct the typo in this comment.
// just includes the ones currenly used in tests/etc

Comment thread renovate/README.md Outdated
Copilot AI review requested due to automatic review settings July 23, 2026 06:40

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

Copilot reviewed 21 out of 21 changed files in this pull request and generated 6 comments.

Comments suppressed due to low confidence (1)

scripts/beachballConfigHelpers.ts:56

  • name is unused in this callback. Repository convention requires unused parameters to be prefixed with _, so name it _name while retaining the PostbumpHook signature.

Comment thread renovate/presets/default.json
Comment thread renovate/presets/beachball.json
Comment thread renovate/presets/base.json
Comment thread renovate/scripts/updateReadme.ts Outdated
Comment thread renovate/presets/customTagActions.json Outdated
Comment thread renovate/scripts/__tests__/customTagActions.test.ts Outdated
Copilot AI review requested due to automatic review settings July 24, 2026 21:15

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

Copilot reviewed 30 out of 30 changed files in this pull request and generated 1 comment.

Comments suppressed due to low confidence (3)

renovate/presets/customTagActions.json:12

  • These patterns require a trailing newline, so a valid workflow whose final uses: entry is at EOF without a final newline is silently skipped by this preset. Accept EOF as an alternative line terminator for both plain-tag and digest-pinned references.
        "uses:\\s+(?<depName>(?<packageName>[^/\\s]+/[^/\\s]+)/[^@\\s]+)@(?<currentValue>[\\w.-]+_v\\d+(?:\\.\\d+){0,2})\\r?\\n",
        "uses:\\s+(?<depName>(?<packageName>[^/\\s]+/[^/\\s]+)/[^@\\s]+)@(?<currentDigest>[0-9a-f]{40})[ \t]+#\\s*(?<currentValue>[\\w.-]+_v\\d+(?:\\.\\d+){0,2})\\r?\\n"

renovate/scripts/updateReadme.ts:124

  • The generated usage example omits required preset arguments. This currently produces restrictNode without (arg0) in the README, even though the preset contains {{arg0}} and the validation helper supplies (16). Render a concrete argument in parameterized preset references so the documented config is usable.
"extends": ["${repoPresetPrefix}${name}"]

renovate/presets/base.json:29

  • The Yarn resolutions workaround is removed here, but this repo still installs Renovate 43.260.3 from .renovate-version (released July 13), while renovatebot/renovate#44776 was merged July 22. The pinned validator/dry-run therefore still has the bug this rule guarded against, including for this repo's version-qualified resolution keys. Update the Renovate pin to a release containing #44776 before dropping the rule.
  "packageRules": [
    {
      "matchDepTypes": ["devDependencies"],
      "commitMessageTopic": "devDependency {{{depName}}}"
    },

Comment thread renovate/scripts/utils/paths.ts Outdated
Copilot AI review requested due to automatic review settings July 24, 2026 22:46

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

Copilot reviewed 31 out of 31 changed files in this pull request and generated 2 comments.

Comments suppressed due to low confidence (3)

renovate/presets/base.json:25

  • This drops the Yarn resolutions workaround while CI still installs Renovate 43.260.3 from renovate/.renovate-version (released July 13), but the linked fix was merged July 22. The full dry run therefore still processes this repo's version-qualified resolution keys with the old bug. Update the pinned minimum to a release containing renovate#44776 before removing the rule, or retain the workaround.
  "packageRules": [

renovate/presets/customTagActions.json:11

  • A valid tagged action with an ordinary inline YAML comment, such as uses: owner/repo/action@action_v3 # reason, does not match because the regex ends immediately after the tag. The package rule below still disables Renovate's built-in manager based on currentValue, leaving that dependency unmanaged. Allow optional trailing whitespace/comment text and cover that case in the tests.
        "(?m)^\\s*uses:\\s+(?<depName>(?<packageName>[^/\\s]+/[^/\\s]+)/[^@\\s]+)@(?<currentValue>[\\w.-]+_v\\d+(?:\\.\\d+){0,2})$",

renovate/scripts/utils/paths.ts:21

  • This comment is self-contradictory: serverConfigRel is the relative string scripts/serverConfig.ts, not an absolute path.
  /** Relative path from repo root to test server config (absolute) */

Comment thread renovate/scripts/serverConfig.ts Outdated
Comment thread renovate/README.md Outdated
Copilot AI review requested due to automatic review settings July 24, 2026 23:05

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

Copilot reviewed 31 out of 31 changed files in this pull request and generated 2 comments.

Comments suppressed due to low confidence (1)

scripts/beachballConfigHelpers.ts:35

  • The moving renovate_v3 tag will not advance after its first release. tagPackages.ts:6 force-moves it only locally, while bumpAndPush.ts:85-87 publishes with git push --follow-tags and no force; --follow-tags does not update an existing remote tag. Force-push only the moving major tags (while keeping exact tags immutable), or omit the major tag until the publish path supports updating it.

Comment thread renovate/scripts/utils/extends.ts
Comment thread renovate/CHANGELOG.md
Copilot AI review requested due to automatic review settings July 24, 2026 23:14

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

Copilot reviewed 31 out of 31 changed files in this pull request and generated 3 comments.

Comments suppressed due to low confidence (1)

renovate/presets/base.json:25

  • The workaround is removed even though this repo still installs Renovate 43.260.3 (renovate/.renovate-version), released before the linked fix. PR #44776 first shipped in 43.276.0, so the version used by this repo—and consumers on the tested baseline—will again misparse the versioned resolutions keys present in the root package. Retain the rule or bump the pinned/minimum Renovate version to at least 43.276.0.
  "packageRules": [

Comment on lines +11 to +12
"(?m)^\\s*uses:\\s+(?<depName>(?<packageName>[^/\\s]+/[^/\\s]+)/[^@\\s]+)@(?<currentValue>[\\w.-]+_v\\d+(?:\\.\\d+){0,2})[ \t]*($|#)",
"(?m)^\\s*uses:\\s+(?<depName>(?<packageName>[^/\\s]+/[^/\\s]+)/[^@\\s]+)@(?<currentDigest>[0-9a-f]{40})[ \t]+#\\s*(?<currentValue>[\\w.-]+_v\\d+(?:\\.\\d+){0,2})$"
Comment thread renovate/scripts/serverConfig.ts
Comment thread renovate/scripts/__tests__/lintPresets.test.ts
@ecraig12345
ecraig12345 merged commit 8071ab3 into main Jul 24, 2026
13 checks passed
@ecraig12345
ecraig12345 deleted the renovate-revert branch July 24, 2026 23:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants