From 19a8c607d04846ace1e90e1c429b05cbc0b7fc27 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Nov 2024 05:12:57 +0000 Subject: [PATCH 1/2] Bump gittools/actions from 2 to 3 Bumps [gittools/actions](https://github.com/gittools/actions) from 2 to 3. - [Release notes](https://github.com/gittools/actions/releases) - [Commits](https://github.com/gittools/actions/compare/v2...v3) --- updated-dependencies: - dependency-name: gittools/actions dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/docker-build-latest.yml | 4 ++-- .github/workflows/docker-build-on-release.yml | 4 ++-- .github/workflows/showversion.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/docker-build-latest.yml b/.github/workflows/docker-build-latest.yml index 2d6d3c8d..eab44cc4 100644 --- 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 index f0271ef2..1e9b1906 100644 --- 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 index 82631ec1..35f1c67a 100644 --- 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" From 1d796502d63646fb6ada0186ae9b502ab7a77ebf Mon Sep 17 00:00:00 2001 From: Blaise deB Frederick Date: Tue, 19 Nov 2024 08:57:10 -0500 Subject: [PATCH 2/2] Make it easier to set specific versions --- testdocker.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/testdocker.sh b/testdocker.sh index 576a2912..c1967444 100755 --- 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_