Skip to content

Use a regex to match feature branch#296

Open
rwb27 wants to merge 2 commits intomainfrom
fix-feature-branch-detection
Open

Use a regex to match feature branch#296
rwb27 wants to merge 2 commits intomainfrom
fix-feature-branch-detection

Conversation

@rwb27
Copy link
Collaborator

@rwb27 rwb27 commented Mar 25, 2026

I had some odd issues where the feature branch seemed to contain junk characters at the end.

This PR changes two things:

  1. We now match the branch name more robustly with a regex. That should stop us having junk at the end of the string.
  2. We no longer use an if condition on check-for-ofm-feature-branch, instead it will just return an empty string. There's now an if condition on the test-against-ofm-feature-branch job. That removes the need for the somewhat unsightly toJSON and \r\n.

I will update this description once I've tested that it works both with and without a feature branch specified.

@barecheck
Copy link

barecheck bot commented Mar 25, 2026

Barecheck - Code coverage report

Total: 96.34%

Your code coverage diff: 0.00% ▴

✅ All code changes are covered

I had some odd issues where the feature branch seemed to contain junk characters at the end.

This changes two things:
1. We now match the branch name more robustly with a regex.
2. We no longer use an `if` condition on `check-for-ofm-feature-branch`, instead it will just return an empty string. There's now an `if` condition on the `test-against-ofm-feature-branch` job.
@rwb27 rwb27 force-pushed the fix-feature-branch-detection branch from 5d60d71 to 9a89c02 Compare March 25, 2026 14:49
Given that we can still merge if the workflow fails, it feels best to remove the `continue-on-error` setting from the jobs
that test against OFM.

This isn't intended to be a change of policy, but it will make failures more visible.
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