From fc96fb4a1834d7efe9b34489a92a9dbedbd62d34 Mon Sep 17 00:00:00 2001
From: root <shreelakshmi.iyengar@diamond.ac.uk>
Date: Tue, 25 Aug 2026 13:08:15 +0000
Subject: [PATCH 1/4] ci: Updates to justfile

---
 justfile | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/justfile b/justfile
index 3433acd7f..8e8d84148 100644
--- a/justfile
+++ b/justfile
@@ -1,7 +1,12 @@
 SESSION := "cm12345-1"
-RUNNER := "docker"
+RUNNER := `command -v docker || command -v podman`
 
-compose +ARGS="up -d":
+default: compose serve
+
+init:
+    git submodule update --init --recursive
+
+compose +ARGS="up -d": init
     {{ RUNNER }} compose -f tests/system_tests/compose.yaml {{ARGS}}
 
 serve *OPTS:

From ef7f2ea20892555bbf301b17800169d4f3565d04 Mon Sep 17 00:00:00 2001
From: root <shreelakshmi.iyengar@diamond.ac.uk>
Date: Tue, 25 Aug 2026 13:12:55 +0000
Subject: [PATCH 2/4] add no recreate flag to compose in justfile

---
 justfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/justfile b/justfile
index 8e8d84148..d2430b791 100644
--- a/justfile
+++ b/justfile
@@ -6,7 +6,7 @@ default: compose serve
 init:
     git submodule update --init --recursive
 
-compose +ARGS="up -d": init
+compose +ARGS="up -d --no-recreate": init
     {{ RUNNER }} compose -f tests/system_tests/compose.yaml {{ARGS}}
 
 serve *OPTS:

From 62a4da00d4e5dd40ea313a142ad43aeac3bad9e4 Mon Sep 17 00:00:00 2001
From: root <shreelakshmi.iyengar@diamond.ac.uk>
Date: Tue, 25 Aug 2026 15:44:36 +0000
Subject: [PATCH 3/4] ci: add example-services submodule check to justfile init

---
 justfile | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/justfile b/justfile
index d2430b791..c1d6d7e6a 100644
--- a/justfile
+++ b/justfile
@@ -3,8 +3,12 @@ RUNNER := `command -v docker || command -v podman`
 
 default: compose serve
 
-init:
-    git submodule update --init --recursive
+init-example-services:
+    #!/usr/bin/env bash
+    # Clone the example-services submodule if needed but leave it alone otherwise
+    if [[ $(git submodule status example-services) =~ ^- ]]; then
+        git submodule update --init example-services
+    fi
 
 compose +ARGS="up -d --no-recreate": init
     {{ RUNNER }} compose -f tests/system_tests/compose.yaml {{ARGS}}

From 69aa3d3086a162133fe522ed165a3f1a02dfd220 Mon Sep 17 00:00:00 2001
From: root <shreelakshmi.iyengar@diamond.ac.uk>
Date: Wed, 26 Aug 2026 09:24:17 +0000
Subject: [PATCH 4/4] reference correct init in compose

---
 justfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/justfile b/justfile
index c1d6d7e6a..e4c314af3 100644
--- a/justfile
+++ b/justfile
@@ -10,7 +10,7 @@ init-example-services:
         git submodule update --init example-services
     fi
 
-compose +ARGS="up -d --no-recreate": init
+compose +ARGS="up -d --no-recreate": init-example-services
     {{ RUNNER }} compose -f tests/system_tests/compose.yaml {{ARGS}}
 
 serve *OPTS: