Skip to content

Commit cce52ad

Browse files
author
Derek Hower
committed
Add SINGULARITY env and make regression use it
Signed-off-by: Derek Hower <[email protected]>
1 parent 5a22dc6 commit cce52ad

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

.github/workflows/regress.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ jobs:
1313
- uses: pre-commit/[email protected]
1414
regress-smoke:
1515
runs-on: ubuntu-latest
16+
env:
17+
SINGULARITY: 1
1618
steps:
1719
- name: Clone Github Repo Action
1820
uses: actions/checkout@v4
@@ -45,6 +47,7 @@ jobs:
4547
env:
4648
MANUAL_NAME: isa
4749
VERSIONS: all
50+
SINGULARITY: 1
4851
steps:
4952
- name: Clone Github Repo Action
5053
uses: actions/checkout@v4
@@ -75,6 +78,7 @@ jobs:
7578
env:
7679
EXT: B
7780
VERSION: latest
81+
SINGULARITY: 1
7882
steps:
7983
- name: Clone Github Repo Action
8084
uses: actions/checkout@v4
@@ -102,6 +106,8 @@ jobs:
102106
regress-gen-certificate:
103107
runs-on: ubuntu-latest
104108
needs: regress-smoke
109+
env:
110+
SINGULARITY: 1
105111
steps:
106112
- name: Clone Github Repo Action
107113
uses: actions/checkout@v4
@@ -129,6 +135,8 @@ jobs:
129135
regress-gen-profile:
130136
runs-on: ubuntu-latest
131137
needs: regress-smoke
138+
env:
139+
SINGULARITY: 1
132140
steps:
133141
- name: Clone Github Repo Action
134142
uses: actions/checkout@v4

bin/setup

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,16 @@ CONTAINER_TAG=`cat ${ROOT}/bin/.container-tag`
3232
# 1. devcontainer, if DEVCONTAINER_ENV is set in the enviornment
3333
# 2. the type stored in .container-type
3434
# 3. Docker, if DOCKER is set in the enviornment
35-
# 4. The choice made by the user, which will be cached in .container-type
35+
# 4. Singularity, if SINGULARITY is set in the enviornment
36+
# 5. The choice made by the user, which will be cached in .container-type
3637
if [ -v DEVCONTAINER_ENV ]; then
3738
CONTAINER_TYPE=devcontainer
3839
elif [ -f ${ROOT}/.container-type ]; then
3940
CONTAINER_TYPE=`cat ${ROOT}/.container-type`
4041
elif [ -v DOCKER ]; then
4142
CONTAINER_TYPE=docker
43+
elif [ -v SINGULARITY ]; then
44+
CONTAINER_TYPE=singularity
4245
else
4346
echo -e "UDB tools run in a container. Both Docker and Singularity/Apptainer are supported.\\n\\n1. Docker\\n2. Singularity\\n"
4447
while true; do

0 commit comments

Comments
 (0)