From a35d0fe162a2135b115f915b8dfeab7b27d197b2 Mon Sep 17 00:00:00 2001
From: pgleeson <p.gleeson@gmail.com>
Date: Wed, 8 May 2024 14:40:35 +0100
Subject: [PATCH 1/3] Update GHA versions

---
 .github/workflows/docker-image-intel.yml    | 6 +++---
 .github/workflows/docker-image-quickrun.yml | 6 +++---
 .github/workflows/docker-image.yml          | 6 +++---
 .github/workflows/docker-pull.yml           | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/docker-image-intel.yml b/.github/workflows/docker-image-intel.yml
index 3bb76fd..a9d5a0a 100644
--- a/.github/workflows/docker-image-intel.yml
+++ b/.github/workflows/docker-image-intel.yml
@@ -2,9 +2,9 @@ name: Docker Image Test Build - Intel drivers
 
 on:
   push:
-    branches: [ master, dev* ]
+    branches: [ master, dev*, test* ]
   pull_request:
-    branches: [ master, dev* ]
+    branches: [ master, dev*, test* ]
 
 jobs:
 
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Build the Docker image
       run: |
diff --git a/.github/workflows/docker-image-quickrun.yml b/.github/workflows/docker-image-quickrun.yml
index c62282b..31f1cfc 100644
--- a/.github/workflows/docker-image-quickrun.yml
+++ b/.github/workflows/docker-image-quickrun.yml
@@ -2,9 +2,9 @@ name: Docker Image Test - quick
 
 on:
   push:
-    branches: [ master, dev* ]
+    branches: [ master, dev*, test* ]
   pull_request:
-    branches: [ master, dev* ]
+    branches: [ master, dev*, test* ]
 
 jobs:
 
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Build the Docker image
       run: |
         chmod a+w output/
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index fac7003..3bd3c08 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -2,9 +2,9 @@ name: Docker Image Test Build
 
 on:
   push:
-    branches: [ master, dev* ]
+    branches: [ master, dev*, test* ]
   pull_request:
-    branches: [ master, dev* ]
+    branches: [ master, dev*, test* ]
 
 jobs:
 
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Build the Docker image
       run: |
         chmod a+w output/
diff --git a/.github/workflows/docker-pull.yml b/.github/workflows/docker-pull.yml
index 583620b..45c1806 100644
--- a/.github/workflows/docker-pull.yml
+++ b/.github/workflows/docker-pull.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Run the Docker image
       run: |

From e49b7a7c7f35eb96efa496ea21e778a6a170ed4f Mon Sep 17 00:00:00 2001
From: pgleeson <p.gleeson@gmail.com>
Date: Wed, 8 May 2024 15:01:55 +0100
Subject: [PATCH 2/3] Ensure short win paths

---
 run-shell-only.cmd | 2 +-
 run.cmd            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/run-shell-only.cmd b/run-shell-only.cmd
index 64fe0d5..f2861b8 100644
--- a/run-shell-only.cmd
+++ b/run-shell-only.cmd
@@ -1,5 +1,5 @@
 SET OW_OUT_DIR=/home/ow/shared
-SET HOST_OUT_DIR=%~dp0
+SET HOST_OUT_DIR=%~dps0
 
 docker run -it ^
     --name openworm ^
diff --git a/run.cmd b/run.cmd
index 8168273..93b2139 100644
--- a/run.cmd
+++ b/run.cmd
@@ -2,7 +2,7 @@
 setlocal
 
 set OW_OUT_DIR=/home/ow/shared
-set HOST_OUT_DIR=%~dp0
+set HOST_OUT_DIR=%~dps0
 
 :GETOPTS
  if /i "%1" == "-d" set DURATION=%2 & shift

From 0ce2ab6bcbab47ba7dc10dad976e5db8989a223c Mon Sep 17 00:00:00 2001
From: pgleeson <p.gleeson@gmail.com>
Date: Wed, 8 May 2024 15:04:30 +0100
Subject: [PATCH 3/3] Extract current version from file VERSION in run.cmd and
 run-shell-only.cmd too

---
 run-shell-only.cmd | 3 ++-
 run.cmd            | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/run-shell-only.cmd b/run-shell-only.cmd
index f2861b8..c2d4fff 100644
--- a/run-shell-only.cmd
+++ b/run-shell-only.cmd
@@ -1,10 +1,11 @@
 SET OW_OUT_DIR=/home/ow/shared
 SET HOST_OUT_DIR=%~dps0
+@SET /P version=<VERSION
 
 docker run -it ^
     --name openworm ^
     -e OW_OUT_DIR=%OW_OUT_DIR% ^
     --privileged ^
     -v %HOST_OUT_DIR%:%OW_OUT_DIR%:rw ^
-    openworm/openworm:0.9.3 ^
+    openworm/openworm:%version% ^
     /bin/bash
diff --git a/run.cmd b/run.cmd
index 93b2139..8a68d87 100644
--- a/run.cmd
+++ b/run.cmd
@@ -3,6 +3,7 @@ setlocal
 
 set OW_OUT_DIR=/home/ow/shared
 set HOST_OUT_DIR=%~dps0
+@SET /P version=<VERSION
 
 :GETOPTS
  if /i "%1" == "-d" set DURATION=%2 & shift
@@ -20,7 +21,7 @@ docker run -d ^
   -e DURATION=%DURATION% ^
   --privileged ^
   -v %HOST_OUT_DIR%:%OW_OUT_DIR%:rw ^
-  openworm/openworm:0.9.3 ^
+  openworm/openworm:%version% ^
   /bin/bash -c "python master_openworm.py"
 
 docker logs -f openworm