Skip to content

Commit 498a2df

Browse files
committed
WIP: test with apptainer
1 parent 76fb186 commit 498a2df

File tree

2 files changed

+15
-20
lines changed

2 files changed

+15
-20
lines changed

.github/workflows/ci-tests.yml

Lines changed: 11 additions & 16 deletions
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:
@@ -34,9 +37,9 @@ jobs:
3437

3538
- name: Set up Singularity
3639
if: ${{ matrix.step == 'unit' || matrix.step == 'mypy' }}
37-
run: |
38-
wget --no-verbose https://github.com/sylabs/singularity/releases/download/v3.10.4/singularity-ce_3.10.4-focal_amd64.deb
39-
sudo apt-get install -y ./singularity-ce_3.10.4-focal_amd64.deb
40+
uses: eWaterCycle/setup-apptainer@v2
41+
with:
42+
apptainer-version: ${{ env.apptainer_version }}
4043

4144
- name: Set up Python
4245
uses: actions/setup-python@v4
@@ -108,24 +111,16 @@ jobs:
108111

109112
release_test:
110113
name: cwl-utils release test
114+
111115
runs-on: ubuntu-22.04
112116

113117
steps:
114118
- uses: actions/checkout@v3
115119

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

130125
- name: Set up Python
131126
uses: actions/setup-python@v4

.github/workflows/tag_to_publish.yml

Lines changed: 4 additions & 4 deletions
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)