From 3c3f702ad35ff37f7b78ddd26e326488ca9951a3 Mon Sep 17 00:00:00 2001 From: David Keymer Date: Mon, 20 Oct 2025 17:34:33 +0100 Subject: [PATCH] Added deploy script details to instrument scripts page --- doc/scripting/instrument-scripts.md | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/doc/scripting/instrument-scripts.md b/doc/scripting/instrument-scripts.md index db411d58b..3920e0266 100644 --- a/doc/scripting/instrument-scripts.md +++ b/doc/scripting/instrument-scripts.md @@ -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. \ No newline at end of file +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.