Skip to content

Stabilize CI for updated pull requests - #20

Merged
ashtree74 merged 2 commits into
mainfrom
codex/fix-dco-update-branch
Aug 12, 2026
Merged

Stabilize CI for updated pull requests#20
ashtree74 merged 2 commits into
mainfrom
codex/fix-dco-update-branch

Conversation

@ashtree74

@ashtree74 ashtree74 commented Aug 12, 2026

Copy link
Copy Markdown
Owner

Summary

  • identify Dependabot PRs by the PR author instead of the workflow actor
  • exclude mechanical merge commits created by GitHub branch updates from DCO scope
  • continue requiring a valid Signed-off-by line on every non-merge contribution commit
  • make the source synchronization test await actual selection and scroll events instead of fixed timing windows

Verification

  • workflow YAML parsed successfully
  • reproduced PR ci: bump actions/checkout from 6.0.2 to 7.0.1 #17 history: the unsigned GitHub merge is excluded, while the signed Dependabot contribution remains in scope
  • synchronization test passed 25 consecutive runs, then another 10/10 after final review edits
  • full local suite passed: 135 XCTest + 5 Swift Testing tests
  • git diff --check passed

Signed-off-by: Adam Jesionkiewicz adam@jesion.pl

Signed-off-by: Adam Jesionkiewicz <adam@jesion.pl>

@ashtree74 ashtree74 left a comment

Copy link
Copy Markdown
Owner Author

Choose a reason for hiding this comment

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

Self-review completed. No blocking findings.

The check still enforces DCO on every non-merge contribution commit. It only excludes merge commits generated while updating a PR branch and uses the immutable PR author to identify Dependabot. Reproduction against PR #17 leaves its signed bot commit in DCO scope and excludes only the unsigned mechanical merge.

I cannot approve my own PR; after required checks pass I will use the documented maintainer PR-only bypass.

Signed-off-by: Adam Jesionkiewicz <adam@jesion.pl>
@ashtree74 ashtree74 changed the title Keep DCO checks stable after branch updates Stabilize CI for updated pull requests Aug 12, 2026

@ashtree74 ashtree74 left a comment

Copy link
Copy Markdown
Owner Author

Choose a reason for hiding this comment

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

Follow-up self-review after the CI-discovered timing failure: no blocking findings.

The test now waits for the two observable synchronization events with bounded one-second expectations and one-shot callbacks. This removes both fixed RunLoop delays from the affected test without changing production code. The final affected test passed 10/10 after review edits (35 consecutive local passes total), and the full suite passed before the one-shot callback hardening. Both commits carry DCO sign-off.

@ashtree74
ashtree74 merged commit 47e36c4 into main Aug 12, 2026
2 checks passed
@ashtree74
ashtree74 deleted the codex/fix-dco-update-branch branch August 12, 2026 14:46
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