Skip to content
Snippets Groups Projects

2022-09-12: daily merge of 22.0 into master

Closed Edward Moyse requested to merge emoyse/athena:sweep_22.0_master_2022-09-12 into master

No conflicts.

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • This merge request affects no known files AND packages. Consult an expert!

    This merge request affects 0 files:

  • closed

  • Closed because no files are affected. I think it's just because the commits selected were all cherry-picks back to 22.0.`

    @fwinkl @elmsheus @abarton ... this is my first attempt at a daily merge so can one of you just reassure me this is correct and I've not made a mistake?

  • Indeed it looks like 22.0 didn't merge anything today (and I caught up with everything that wasn't a cherry-pick from master over the weekend).

  • Doing the procedure right now I see locally:

    Merge made by the 'recursive' strategy.
     Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py | 13 ++++++++-----
     Trigger/TrigT1/TrigT1NSWSimTools/src/PadTriggerLogicOfflineTool.cxx             | 13 ++++++++++---
     Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Config/MenuComponents.py         |  2 +-
     3 files changed, 19 insertions(+), 9 deletions(-)

    but this is most probably due to 3-4 MRs that have been merged to 22.0 branch just in the past minutes.

  • :white_check_mark: CI Result SUCCESS (hash 0cf4d832)

    Athena AthSimulation AthGeneration AnalysisBase AthAnalysis DetCommon
    externals :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
    cmake :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
    make :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
    tests :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:

    Full details available on this CI monitor view. Check the JIRA CI status board for known problems
    :white_check_mark: Athena: number of compilation errors 0, warnings 0
    :white_check_mark: AthSimulation: number of compilation errors 0, warnings 0
    :white_check_mark: AthGeneration: number of compilation errors 0, warnings 0
    :white_check_mark: AnalysisBase: number of compilation errors 0, warnings 0
    :white_check_mark: AthAnalysis: number of compilation errors 0, warnings 0
    :white_check_mark: DetCommon: number of compilation errors 0, warnings 0
    :pencil: For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 58766]

Please register or sign in to reply
Loading