Merge pull request #346 from openworm/development

More fixes for windows scripts
openworm · May 8, 2024 · a24bdec · a24bdec
2 parents 4de9071 + 0ce2ab6
commit a24bdec
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 14 deletions.
diff --git 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
@@ -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
@@ -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
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Run the Docker image
       run: |

diff --git 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=%~dp0
+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
@@ -2,7 +2,8 @@
 setlocal
 
 set OW_OUT_DIR=/home/ow/shared
-set HOST_OUT_DIR=%~dp0
+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