[loispostula]

Fix #253

Updatecli deprecated the automerge field of the github/pullrequest action in favour of merge.strategy, and warns once per pipeline when a manifest still carries it, including with the automerge: false these policies ship by default. An organisation wide run printed that warning 1274 times in a single job.

Every _scm.*.yaml template now renders:

    spec:
      merge:
        strategy: '{{ if .merge.strategy }}{{ .merge.strategy }}{{ else if .automerge }}auto{{ else }}manual{{ end }}'
        # {{ if .merge.after }}
        after: '{{ .merge.after }}'
        # {{ end }}

merge.strategy is a new value, and automerge stays as the fallback, so no existing values file has to change. This also puts the client strategy and its after delay within reach of a policy, which the hardcoded automerge never allowed.

Precedence, verified with updatecli manifest show:

values	rendered
defaults	strategy: manual
automerge: true	strategy: auto
merge: {strategy: client, after: 48h}	strategy: client, after: 48h
automerge: true and merge.strategy: manual	strategy: manual

after renders only when set, so the core default of 24h for the client strategy still applies.

75 templates over 38 policies, scaffolds included, each with a minor version bump, its CHANGELOG.md entry, the merge defaults in values.yaml and the two values documented in README.md. updatecli/updatecli.d/policies.yaml, which carries automerge: true for this repository's own pipeline, is migrated too.

Test

make test

39 policies pass the validation.

Additional Information

Tradeoff

merge.strategy has to exist in every values.yaml, otherwise the template fails on a missing key, so the defaults carry an empty merge.strategy and merge.after. The alternative, guarding each access, costs a longer template line in 75 files.

[coderabbitai]

Important

• 🔍 Trigger review

This repository does not receive automatic reviews because it has fewer than 10 stars.

⚙️ Run configuration

• Source mode: Auto
• Repository: Unavailable
• Branch: Unavailable
• File: No configuration file from this repository applied
• Commit: Unavailable
• Layers: defaults
• Review profile: CHILL
• Plan: Advanced
• Run ID: 04074749-ee77-49b0-9e3c-d48ec7a80f6d

• Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

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

• X
• Mastodon
• Reddit
• LinkedIn

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