Skip to content

Commit ac95ce1

Browse files
committed
WIP: test with apptainer
1 parent eb89df4 commit ac95ce1

File tree

2 files changed

+15
-20
lines changed

2 files changed

+15
-20
lines changed

.github/workflows/ci-tests.yml

+11-16
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ concurrency:
1010
group: build-${{ github.event.pull_request.number || github.ref }}
1111
cancel-in-progress: true
1212

13+
env:
14+
apptainer_version: 1.1.8
15+
1316
jobs:
1417

1518
tox:
@@ -41,9 +44,9 @@ jobs:
4144

4245
- name: Set up Singularity
4346
if: ${{ matrix.step == 'unit' || matrix.step == 'mypy' }}
44-
run: |
45-
wget --no-verbose https://github.com/sylabs/singularity/releases/download/v3.10.4/singularity-ce_3.10.4-focal_amd64.deb
46-
sudo apt-get install -y ./singularity-ce_3.10.4-focal_amd64.deb
47+
uses: eWaterCycle/setup-apptainer@v2
48+
with:
49+
apptainer-version: ${{ env.apptainer_version }}
4750

4851
- name: Set up Python
4952
uses: actions/setup-python@v4
@@ -114,24 +117,16 @@ jobs:
114117

115118
release_test:
116119
name: cwl-utils release test
120+
117121
runs-on: ubuntu-22.04
118122

119123
steps:
120124
- uses: actions/checkout@v3
121125

122-
- name: Set up Singularity
123-
run: |
124-
wget --no-verbose https://github.com/sylabs/singularity/releases/download/v3.10.4/singularity-ce_3.10.4-jammy_amd64.deb
125-
sudo apt-get install -y ./singularity-ce_3.10.4-jammy_amd64.deb
126-
127-
- name: pull some containers
128-
run: |
129-
export CWL_SINGULARITY_CACHE=$(echo $GITHUB_WORKSPACE)/singularity_cache
130-
mkdir -p ${CWL_SINGULARITY_CACHE}
131-
singularity pull --name ${CWL_SINGULARITY_CACHE}/node_alpine.sif docker://docker.io/node:alpine
132-
ls -lh ${CWL_SINGULARITY_CACHE}
133-
echo ${CWL_SINGULARITY_CACHE}
134-
echo "CWL_SINGULARITY_CACHE=${CWL_SINGULARITY_CACHE}" >> $GITHUB_ENV
126+
- name: Set up Apptainer
127+
uses: eWaterCycle/setup-apptainer@2
128+
with:
129+
apptainer-version: ${{ env.apptainer_version }}
135130

136131
- name: Set up Python
137132
uses: actions/setup-python@v4

.github/workflows/tag_to_publish.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ concurrency:
99
cancel-in-progress: true
1010

1111
env:
12-
singularity_version: 3.6.4
12+
apptainer_version: 1.1.8
1313

1414
jobs:
1515
release_to_pypi:
@@ -20,10 +20,10 @@ jobs:
2020
steps:
2121
- uses: actions/checkout@v3
2222

23-
- name: Set up Singularity
24-
uses: eWaterCycle/setup-singularity@v7
23+
- name: Set up Apptainer
24+
uses: eWaterCycle/setup-apptainer@v2
2525
with:
26-
singularity-version: ${{ env.singularity_version }}
26+
apptainer-version: ${{ env.apptainer_version }}
2727

2828
- name: Set up Python
2929
uses: actions/setup-python@v4

0 commit comments

Comments
 (0)