Skip to content

Commit cd01f51

Browse files
committed
CI: use newer Singularity
1 parent 1ecaedc commit cd01f51

File tree

1 file changed

+13
-24
lines changed

1 file changed

+13
-24
lines changed

.github/workflows/ci-tests.yml

Lines changed: 13 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ concurrency:
1010
group: build-${{ github.event.pull_request.number || github.ref }}
1111
cancel-in-progress: true
1212

13-
env:
14-
singularity_version: 3.8.3
15-
1613
jobs:
1714

1815
tox:
@@ -41,9 +38,9 @@ jobs:
4138

4239
- name: Set up Singularity
4340
if: ${{ matrix.step == 'unit' || matrix.step == 'mypy' }}
44-
uses: eWaterCycle/setup-singularity@v7
45-
with:
46-
singularity-version: ${{ env.singularity_version }}
41+
run: |
42+
wget --no-verbose https://github.com/sylabs/singularity/releases/download/v3.10.4/singularity-ce_3.10.4-focal_amd64.deb
43+
sudo apt-get install -y ./singularity-ce_3.10.4-focal_amd64.deb
4744
4845
- name: Set up Python
4946
uses: actions/setup-python@v4
@@ -86,8 +83,8 @@ jobs:
8683
step: [lint-readme, pydocstyle]
8784

8885
env:
89-
py-semver: 3.11
90-
TOXENV: ${{ format('py310-{0}', matrix.step) }}
86+
py-semver: "3.11"
87+
TOXENV: ${{ format('py311-{0}', matrix.step) }}
9188

9289
steps:
9390
- uses: actions/checkout@v3
@@ -98,12 +95,7 @@ jobs:
9895
uses: actions/setup-python@v4
9996
with:
10097
python-version: ${{ env.py-semver }}
101-
102-
- name: Cache for pip
103-
uses: actions/cache@v3
104-
with:
105-
path: ~/.cache/pip
106-
key: ${{ runner.os }}-pip-${{ matrix.step }}-${{ hashFiles('requirements.txt') }}
98+
cache: pip
10799

108100
- name: Upgrade setuptools and install tox
109101
run: |
@@ -119,27 +111,24 @@ jobs:
119111

120112
release_test:
121113
name: cwl-utils release test
122-
123114
runs-on: ubuntu-22.04
124115

125116
steps:
126117
- uses: actions/checkout@v3
127118

128119
- name: Set up Singularity
129-
uses: eWaterCycle/setup-singularity@v7
130-
with:
131-
singularity-version: ${{ env.singularity_version }}
120+
run: |
121+
wget --no-verbose https://github.com/sylabs/singularity/releases/download/v3.10.4/singularity-ce_3.10.4-jammy_amd64.deb
122+
sudo apt-get install -y ./singularity-ce_3.10.4-jammy_amd64.deb
132123
133124
- name: Set up Python
134125
uses: actions/setup-python@v4
135126
with:
136127
python-version: 3.11
137-
138-
- name: Cache for pip
139-
uses: actions/cache@v3
140-
with:
141-
path: ~/.cache/pip
142-
key: ${{ runner.os }}-pip-release-${{ hashFiles('requirements.txt', 'test-requirements.txt') }}
128+
cache: pip
129+
cache-dependency-path: |
130+
requirements.txt
131+
test-requirements.txt
143132
144133
- name: Install packages
145134
run: |

0 commit comments

Comments
 (0)