From e00dff54d55575e89028e08e550828db3f279c14 Mon Sep 17 00:00:00 2001 From: Derek Hower Date: Mon, 29 Jul 2024 07:55:15 -0700 Subject: [PATCH] Change bash variable detection --- .github/workflows/regress.yml | 2 -- bin/setup | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/regress.yml b/.github/workflows/regress.yml index 441175574..7a0d3d3f1 100644 --- a/.github/workflows/regress.yml +++ b/.github/workflows/regress.yml @@ -12,8 +12,6 @@ jobs: uses: actions/checkout@v4 - name: Setup apptainer uses: eWaterCycle/setup-apptainer@v2.0.0 - - name: Read container tag - run: echo "CONTAINER_TAG=$(cat bin/.container-tag)" >> $GITHUB_ENV - name: Get container from cache id: cache-sif uses: actions/cache@v3 diff --git a/bin/setup b/bin/setup index 685c82090..f7d51501b 100755 --- a/bin/setup +++ b/bin/setup @@ -6,7 +6,7 @@ cd $ROOT CONTAINER_TAG=`cat ${ROOT}/bin/.container-tag` -if [ -z ${GITHUB_ACTIONS+x} ]; then +if [ -v GITHUB_ACTIONS ]; then CONTAINER_PATH=${ROOT}/.singularity/image-$CONTAINER_TAG.sif SINGULARITY_CACHE=--disable-cache else