Skip to content

Instrument Scripts: Add deploy script that pulls latest master  #7914

@ThomasLohnert

Description

@ThomasLohnert

As a user of the InstrumentScripts / Scans library, I would like my scripts repository to be brought up to date frequently. At the moment, we do this manually on a case-by-case basis as appropriate, we should put a more well defined process into place as discussed here: #7626 (comment).

In order to more easily deploy changes to the Instrument Scripts repo, we should have a utility script / deploy upgrade step that pulls the latest master from the remote and attempts to integrate those changes into the local folder on the instrument specific branch.

Acceptance Criteria

What is the acceptance criteria?

  • There is an automated script that updates the scripts repository in /Instrument/Scripts/. This should:
    • Pull latest master
    • Attempt to merge master into instrument branch (NDX<INST>)
    • If the merge fails, this should give the user options to skip or force overwrite
  • For avoidance of doubt this is only during deploy, not a regular task

Discussed planning 10/07/2025 before recording started

Extra Information

How to Test

verbose instructions for reviewer to test changes
(Add before making a PR)

Metadata

Metadata

Assignees

Labels

Type

No type

Projects

Status

Done

Relationships

None yet

Development

No branches or pull requests

Issue actions