Skip to content

Conversation

cgrindel-self-hosted-renovate[bot]
Copy link
Contributor

This PR contains the following updates:

Package Update Change
stripe/stripe-ios-spm patch from: "24.24.1" -> from: "24.24.2"

Release Notes

stripe/stripe-ios-spm (stripe/stripe-ios-spm)

v24.24.2

Compare Source

24.24.2 2025-10-06

PaymentSheet
  • [Improved] Improved CVC recollection UI in Link
General
  • [Improved] Added automatic retry on network errors when fetching payment intents for improved resilience

Configuration

📅 Schedule: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 Automerge: Enabled.

Rebasing: Whenever PR is behind base branch, or you tick the rebase/retry checkbox.

👻 Immortal: This PR will be recreated if closed unmerged. Get config help if that's undesired.


  • If you want to rebase/retry this PR, check this box

This PR has been generated by Renovate Bot.

@cgrindel-self-hosted-renovate
Copy link
Contributor Author

Edited/Blocked Notification

Renovate will not automatically rebase this PR, because it does not recognize the last commit author and assumes somebody else may have edited the PR.

You can manually request rebase by checking the rebase/retry box above.

⚠️ Warning: custom changes will be lost.

@cgrindel cgrindel disabled auto-merge October 7, 2025 14:04
@cgrindel
Copy link
Owner

cgrindel commented Oct 7, 2025

@Mergifyio queue

Copy link
Contributor

mergify bot commented Oct 7, 2025

queue

🛑 Configuration not compatible with a branch protection setting

The branch protection setting Require branches to be up to date before merging is not compatible with draft PR checks. To keep this branch protection enabled, update your Mergify configuration to enable in-place checks: set merge_queue.max_parallel_checks: 1, set every queue rule batch_size: 1, and avoid two-step CI (make merge_conditions identical to queue_conditions). Otherwise, disable this branch protection.

@cgrindel cgrindel merged commit cc0fcab into main Oct 7, 2025
69 of 71 checks passed
@cgrindel cgrindel deleted the github-renovate/stripe-stripe-ios-spm-24.x branch October 7, 2025 14:17
cgrindel added a commit that referenced this pull request Oct 7, 2025
## Summary

Adds `.mergify.yml` configuration to resolve incompatibility between
Mergify merge queue and GitHub branch protection setting "Require
branches to be up to date before merging" (strict mode).

## Changes

- Add `.mergify.yml` with merge queue configuration
- Set `max_parallel_checks: 1` to enable in-place checks
- Set `batch_size: 1` for single-PR processing
- Configure identical `merge_conditions` and `queue_conditions`
- Add draft PR exclusion (`-draft`) to prevent strict mode conflicts
- Include safety conditions: `-closed`, `-merged`, `base=main`
- Configure squash merge method for conventional commits
- Add timeout configurations for queue and CI checks

## Post-Merge Verification

After merging, verify on subsequent PRs:

- [ ] Mergify no longer shows configuration compatibility errors
- [ ] Automatic merge queue works on approved PRs
- [ ] Draft PRs are excluded from queue
- [ ] Status checks are properly enforced

Fixes the issue reported in #1853

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-authored-by: Claude <noreply@anthropic.com>
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.

1 participant