Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

More fixes for windows scripts #346

Merged
merged 3 commits into from
May 8, 2024
Merged

More fixes for windows scripts #346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a35d0fe
Update GHA versions
pgleeson May 8, 2024
e49b7a7
Ensure short win paths
pgleeson May 8, 2024
0ce2ab6
Extract current version from file VERSION in run.cmd and run-shell-on…
pgleeson May 8, 2024
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
6 changes: 3 additions & 3 deletions .github/workflows/docker-image-intel.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand All @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Build the Docker image
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/docker-image-quickrun.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand All @@ -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/
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/docker-image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand All @@ -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/
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-pull.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Run the Docker image
run: |
Expand Down
5 changes: 3 additions & 2 deletions run-shell-only.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
5 changes: 3 additions & 2 deletions run.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down