Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion doc/scripting/instrument-scripts.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
# Shared Instrument Scripts

The general instrument scripts are in this [repository](https://github.com/ISISNeutronMuon/InstrumentScripts) and include scripts like `do_sans` and `do_trans`, as well as the (old) scans library.
The general instrument scripts are in this [repository](https://github.com/ISISNeutronMuon/InstrumentScripts) and include scripts like `do_sans` and `do_trans`, as well as the (old) scans library.

During IBEX deployment, an optional step has been added to the deploy script (see [ticket](https://github.com/ISISComputingGroup/IBEX/issues/7914)
for details) to pull the latest master branch of the scripts repository and attempt an automatic merge with the local branch.
This step will immediately fail if the local branch is _not_ named after the machine (e.g. _NDXxxx_) it is being run on.
Following a successful check of the branch name, an automatic merge is attempted and should this fail,
a set of instructions is presented to the user to perform a _manual_ merge. No further action is taken by this deployment task.

At the time of writing, there is **no** automated task for this 'pull and merge' of the instrument scripts
(i.e. is it not present in the CI system), it is **only** performed as an optional step during IBEX deployment.