Skip to content

Johnfreeman/merge prep release - #515

Merged
jcfreeman2 merged 4 commits into
developfrom
johnfreeman/merge_prep-release
Sep 30, 2026
Merged

jcfreeman2 merged 4 commits into
developfrom
johnfreeman/merge_prep-release

Conversation

@jcfreeman2

Copy link
Copy Markdown
Contributor

Description

This is a de-facto merge of the prep-release/fddaq-v5.7.0 branch into develop. The source branch:

  • Was forked from prep-release/fddaq-v5.7.0
  • Had develop merged into it
  • Had conflicts manually resolved (if necessary)
  • Had clang formatting re-applied (if necessary)

A test build, MRGFD_DEV_260929_A9, was created which uses this feature branch, and integration tests were run on it.

If full description and testing details are included on a parent issue, please link to that here.
See issue # for details

Otherwise, please include a summary of the change and which issue is fixed (if any).
Include relevant motivation and context, including a target environment and dunedaq version if known.
Also list any dependencies that are required for this change.

Addresses issue #

Please also include instructions for how a reviewer can test your changes.

Type of change

  • Documentation (non-breaking change that adds or improves the documentation)
  • New feature or enhancement (non-breaking change which adds functionality)
  • Optimization (non-breaking change that improves code/performance)
  • Bug fix (non-breaking change which fixes an issue)
  • Breaking change (whatever its nature)

Testing checklist

  • Unit tests pass (e.g. dbt-build --unittest)
  • Minimal system quicktest passes (pytest -s minimal_system_quick_test.py)
  • Full set of integration tests pass (dunedaq_integtest_bundle.sh)
  • Python tests pass if applicable (e.g. python -m pytest)
  • Pre-commit hooks run successfully if applicable (e.g. pre-commit run --all-files)

Comments here on the testing

Further checks

  • Code is commented where needed, particularly in hard-to-understand areas
  • Code style is correct (dbt-build --lint, and/or see https://dune-daq-sw.readthedocs.io/en/latest/packages/styleguide/)
  • If applicable, new tests have been added or an issue has been opened to tackle that in the future.
    (Indicate issue here: # (issue))

@andrewmogan andrewmogan left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

@jcfreeman2
jcfreeman2 merged commit fb1faa8 into develop Sep 30, 2026
5 of 6 checks passed
@jcfreeman2
jcfreeman2 deleted the johnfreeman/merge_prep-release branch September 30, 2026 18:51
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.

4 participants