Skip to content

Johnfreeman/merge in release fddaq 561#364

Merged
jcfreeman2 merged 4 commits into
developfrom
johnfreeman/merge_in_release_fddaq-561
Jun 24, 2026
Merged

Johnfreeman/merge in release fddaq 561#364
jcfreeman2 merged 4 commits into
developfrom
johnfreeman/merge_in_release_fddaq-561

Conversation

@jcfreeman2

Copy link
Copy Markdown
Contributor

Description

This merge is intended to de-facto get the fddaq-v5.6.1 code into the develop branch. A test build using the feature branch is available in TFD_DEV_260623_A9 and its integration tests are successful, https://github.com/DUNE-DAQ/daq-release/actions/runs/28061322531

Type of change

  • Documentation (non-breaking change that adds or improves the documentation)
  • [ X] 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

  • [ X] Unit tests pass (e.g. dbt-build --unittest)
  • [ X] Minimal system quicktest passes (pytest -s minimal_system_quick_test.py)
  • [ X] 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))

Kurt Biery and others added 4 commits June 16, 2026 11:56
Calling a stop for monitoring

Cherry-picked the stop monitoring changes for the patch release.
Cherry-picked the stop monitoring changes for the patch release
@andrewmogan andrewmogan self-requested a review June 24, 2026 16:08

@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 9642557 into develop Jun 24, 2026
6 checks passed
@jcfreeman2 jcfreeman2 deleted the johnfreeman/merge_in_release_fddaq-561 branch June 24, 2026 17:42
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