Repository navigation
Synchronize feature branch - #210
Merged
Merged
Conversation
Fixing URL typo that the CI action caught
Addressing some new stoplist words
rose version update
Reflects the changes to develop to date.
Updated jitr v here. Also added url for Taweret
Patching develop based on changes already made
Bring up to date with develop
Adding neutron-rich-bmm example
Update README.md
Bringing this develop-bmc up to date with develop
adding pybmc
Will address AUTHORS as part of 0.5.0 process
Two reviewers have approved, therefore merging V05release into develop
This was copied from the soon to be abandoned 197PolishProc branch since we prefer to make these changes to develop only.
Improve release procedure
This initial setup was derived from some preliminary testing of the tool in a throwaway repo containing some of the content in this repo. Based on that experience, we should expect multiple failures.
The azure link is to a registration page that contains editable fields, which might cause access failures. Tried changing it to just the landing page. Users should still be able to determine how to register to access software from that page.
Stefan has said that there will be a PR into develop for parmoo soon to account for a recent refactoring. This is a temporary fix to get the URL checker action passing. Ideally, this change will be in develop before they base their branch off of it and can adjust the text as needed.
Two were written with http instead of https. Lychees was ignoring these with the statement that they are unsupported. This will get rid of those statements and makes the links like the first azure link that I dealt with. Ultimately, they will be ignored.
It is using an old version of actions that rely on Node.js 20, which will be dropped soon. Might as well fix this with the URL checker as a single infrastructure hot fix.
Switch URL Checker
Synchronize `develop` and `main`
Member
|
I reviewed the PR and agree that this is a good way to ensure that the bandframework_scottdevelv05 branch is synchronized with develop & main. |
DanielRPhillips
approved these changes
Jun 5, 2026
DanielRPhillips
left a comment
Member
There was a problem hiding this comment.
There are many files that have changed, but this is only because the scottdevelv05 branch was based off of a branch that has since undergone much updating. The only meaningful conflict is the wordlist one, which can easily be resolved manually.
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
9 participants
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.
This feature branch was based off of
mainat v0.4.0 and is being prepared for merging intodevelop. At present bothmainanddevelopare synchronized and contain v0.5 release updates as well as cleanup commits that are not in the feature branch.While the differences between these branches are mostly non-overlapping, we explicitly merge to make it clear in the repo's record that we investigated and resolved the divergence on the feature branch.
@DanielRPhillips I will resolve the merge conflict manually after your review. Since it's just the word list, hopefully it will be a simple, low-risk resolution.