Skip to content

Fix for committing to main immediately after merged PR #2567

Merged
itsmedavep merged 2 commits intomainfrom
dave_update_build_dist_event_trigger_to_push
Mar 23, 2026
Merged

Fix for committing to main immediately after merged PR #2567
itsmedavep merged 2 commits intomainfrom
dave_update_build_dist_event_trigger_to_push

Conversation

@itsmedavep
Copy link
Copy Markdown
Collaborator

@itsmedavep itsmedavep commented Mar 20, 2026

If a user merged PR but immediately pushed a commit directly to main that would create a race condition where HEAD couldn't be fast forwarded.

This cleans that up by triggering on every push to main. So now every push to main will build and commit dist if there are any changes, if not it will exit with 0.

[Short description explaining the high-level reason for the pull request]

Additions

Removals

Changes

  • build-dist-on-main.yml updated to trigger on push and to write commit sha to commit message. Importantly, also added an if so that the workflow will ignore the workflow's own bot created dist commits!
  • pages.yml updated to look for bot created dist commits
  • update to if condition to remove ${{ ... }} syntax because we are no longer looking for a # in the commit comment and so no longer need it.

Testing

Screenshots

Before After

Notes and todos

Checklist

  • PR has an informative and human-readable title
  • Changes are limited to a single goal (no scope creep)
  • Code can be automatically merged (no conflicts)
  • Code follows the standards laid out in the CFPB development guidelines
  • Passes all existing automated tests
  • Any change in functionality is tested
  • New functions are documented (with a description, list of inputs, and expected output)
  • Placeholder code is flagged / future todos are captured in comments
  • Visually tested in supported browsers and devices (see checklist below 👇)
  • Project documentation has been updated
  • Reviewers requested with the Reviewers tool ➡️

Testing checklist

Browsers

Check the current browser support cutoff list for browsers that are advisable
to prioritize for testing.

Accessibility

  • Keyboard friendly
  • Screen reader friendly

Other

  • Is useable without CSS
  • Is useable without JS
  • Flexible from small to large screens
  • No linting errors or warnings
  • JavaScript tests are passing

@itsmedavep itsmedavep merged commit 953a95f into main Mar 23, 2026
3 checks passed
@itsmedavep itsmedavep deleted the dave_update_build_dist_event_trigger_to_push branch March 23, 2026 18:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Development

Successfully merging this pull request may close these issues.

2 participants