Merged
Conversation
Barecheck - Code coverage reportTotal: 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.
5d60d71 to
9a89c02
Compare
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.
a33bdef to
9943353
Compare
This replaces my unpleasant bash script with a much clearer action
9943353 to
1c77aeb
Compare
Collaborator
Author
|
For the record, I've tested commit 1c77aeb with and without the relevant string in the description. |
rwb27
commented
Mar 26, 2026
bprobert97
approved these changes
Mar 26, 2026
Contributor
There was a problem hiding this comment.
This looks good. The only potential thing I notice with the regex on line 225 of the YAML is that [\w\-] only captures alphanumeric characters, underscores and dashes, so if anyone uses a slash or a dot in their OFM branch name it won't get picked up.
This isn't a problem necessarily, but might be worth documenting in a contributing.md or readme.md to prevent confusion in future. This would need documenting in LabThings and OFM Server
This gives slightly more flexibility in specifying the git ref to test against.
fc26041 to
8adc4f2
Compare
Contributor
|
Regex has been updated to allow dots and slashes - happy for this to go in |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
I had some odd issues where the feature branch seemed to contain junk characters at the end.
This PR changes two things:
ifcondition oncheck-for-ofm-feature-branch, instead it will just return an empty string. There's now anifcondition on thetest-against-ofm-feature-branchjob. That removes the need for the somewhat unsightlytoJSONand\r\n.OFM Feature Branch: verify-ui-elementsin the description