Merge pull request #183 from bbfrederick/main

Refresh refine delay
bbfrederick · Nov 19, 2024 · 882ca22 · 882ca22
2 parents 80b196b + 20ad30a
commit 882ca22
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/.github/workflows/docker-build-latest.yml b/.github/workflows/docker-build-latest.yml
@@ -15,7 +15,7 @@ jobs:
         uses: docker/setup-qemu-action@v3
 
       - name: Install GitVersion
-        uses: gittools/actions/gitversion/setup@v2
+        uses: gittools/actions/gitversion/setup@v3
         with:
           versionSpec: '5.x'
 
@@ -27,7 +27,7 @@ jobs:
 
       - name: Determine Version
         id:   gitversion # id to later be referenced
-        uses: gittools/actions/gitversion/execute@v2
+        uses: gittools/actions/gitversion/execute@v3
         with:
           additionalArguments: /config commit-date-format="yyyy-MM-ddTHH:mm:ss-0000"
 

diff --git a/.github/workflows/docker-build-on-release.yml b/.github/workflows/docker-build-on-release.yml
@@ -14,7 +14,7 @@ jobs:
         uses: docker/setup-qemu-action@v3
 
       - name: Install GitVersion
-        uses: gittools/actions/gitversion/setup@v2
+        uses: gittools/actions/gitversion/setup@v3
         with:
           versionSpec: '5.x'
 
@@ -26,7 +26,7 @@ jobs:
 
       - name: Determine Version
         id:   gitversion # id to later be referenced
-        uses: gittools/actions/gitversion/execute@v2
+        uses: gittools/actions/gitversion/execute@v3
         with:
           additionalArguments: /config commit-date-format="yyyy-MM-ddTHH:mm:ss-0000"
 

diff --git a/.github/workflows/showversion.yml b/.github/workflows/showversion.yml
@@ -12,7 +12,7 @@ jobs:
 
     steps:
       - name: Install GitVersion
-        uses: gittools/actions/gitversion/setup@v2
+        uses: gittools/actions/gitversion/setup@v3
         with:
           versionSpec: '5.x'
 
@@ -24,7 +24,7 @@ jobs:
 
       - name: Determine Version
         id:   gitversion # id to later be referenced
-        uses: gittools/actions/gitversion/execute@v2
+        uses: gittools/actions/gitversion/execute@v3
         with:
           additionalArguments: /config commit-date-format="yyyy-MM-ddTHH:mm:ss-0000"
 

diff --git a/testdocker.sh b/testdocker.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 MYIPADDRESS=`ifconfig en0 | grep 'inet ' | awk '{print $2}'`
+VERSION=latest
 
 # allow network connections in Xquartz Security settings
 xhost +
@@ -11,7 +12,7 @@ docker run \
     --mount type=bind,source=/Users/frederic/code/rapidtide/rapidtide/data/examples,destination=/data \
     -it \
     -v /tmp/.X11-unix:/tmp/.X11-unix \
-    -u rapidtide fredericklab/rapidtide:latest \
+    -u rapidtide fredericklab/rapidtide:${VERSION} \
     /cloud/mount-and-run rapidtide \
         /data/src/sub-RAPIDTIDETEST.nii.gz \
         /data/dst/sub-RAPIDTIDETEST \
@@ -25,7 +26,7 @@ docker run \
 #    --mount type=bind,source=/Users/frederic/code/rapidtide/rapidtide/data/examples,destination=/data \
 #    -it \
 #    -v /tmp/.X11-unix:/tmp/.X11-unix \
-#    -u rapidtide fredericklab/rapidtide:latest \
+#    -u rapidtide fredericklab/rapidtide:${VERSION} \
 #    rapidtide \
 #        /data/src/sub-RAPIDTIDETEST.nii.gz \
 #        /data/dst/sub-RAPIDTIDETEST_disabledockermemfix \
@@ -41,7 +42,7 @@ docker run \
 #    --mount type=bind,source=/Users/frederic/code/rapidtide/rapidtide/data/examples,destination=/data \
 #    -it \
 #    -v /tmp/.X11-unix:/tmp/.X11-unix \
-#    -u rapidtide fredericklab/rapidtide:latest \
+#    -u rapidtide fredericklab/rapidtide:${VERSION} \
 #    happy \
 #        /data/src/sub-HAPPYTEST.nii.gz \
 #        /data/src/sub-HAPPYTEST.json \
@@ -55,7 +56,7 @@ docker run \
 #    --mount type=bind,source=/Users/frederic/code/rapidtide/rapidtide/data/examples,destination=/data \
 #    -it \
 #    -v /tmp/.X11-unix:/tmp/.X11-unix \
-#    -u rapidtide fredericklab/rapidtide:latest \
+#    -u rapidtide fredericklab/rapidtide:${VERSION} \
 #    gmscalc \
 #        /data/src/sub-RAPIDTIDETEST.nii.gz \
 #        /data/dst/sub-RAPIDTIDETEST_GMS \
@@ -67,5 +68,5 @@ docker run \
     -it \
     -e DISPLAY=${MYIPADDRESS}:0 \
     -v /tmp/.X11-unix:/tmp/.X11-unix \
-    -u rapidtide fredericklab/rapidtide:latest \
+    -u rapidtide fredericklab/rapidtide:${VERSION} \
     tidepool --dataset /data/code/rapidtide/rapidtide/data/examples/dst/sub-RAPIDTIDETEST_