Skip to content

Commit d22205f

Browse files
committed
drop numpy conda matrix
- follow-up to #2156
1 parent 34cc7ee commit d22205f

1 file changed

Lines changed: 3 additions & 10 deletions

File tree

.github/workflows/build.yml

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -87,16 +87,13 @@ jobs:
8787
runs-on: ubuntu-22.04
8888
outputs:
8989
python-version: ${{ steps.matrix.outputs.python-version }}
90-
numpy-version: ${{ steps.matrix.outputs.numpy-version }}
9190
steps:
9291
- id: matrix
9392
run: |
9493
if ${{ github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags') || github.event_name == 'workflow_dispatch' }}; then
95-
echo "python-version=['3.10', 3.11]" >> $GITHUB_OUTPUT
96-
echo "numpy-version=[1.23, 1.24, 1.25, 1.26]" >> $GITHUB_OUTPUT
94+
echo "python-version=['3.10', 3.11, 3.12]" >> $GITHUB_OUTPUT
9795
else
9896
echo "python-version=['3.10']" >> $GITHUB_OUTPUT
99-
echo "numpy-version=[1.23]" >> $GITHUB_OUTPUT
10097
fi
10198
conda:
10299
defaults: {run: {shell: 'bash -el {0}'}}
@@ -105,10 +102,6 @@ jobs:
105102
strategy:
106103
matrix:
107104
python-version: ${{ fromJson(needs.conda-matrix.outputs.python-version) }}
108-
numpy-version: ${{ fromJson(needs.conda-matrix.outputs.numpy-version) }}
109-
include:
110-
- python-version: 3.12
111-
numpy-version: 1.26
112105
steps:
113106
- uses: actions/checkout@v4
114107
with:
@@ -125,10 +118,10 @@ jobs:
125118
working-directory: recipe
126119
run: |
127120
conda install boa
128-
conda mambabuild . -c conda-forge -c https://tomography.stfc.ac.uk/conda --override-channels --python=${{ matrix.python-version }} --numpy=${{ matrix.numpy-version }} --output-folder .
121+
conda mambabuild . -c conda-forge -c https://tomography.stfc.ac.uk/conda --override-channels --python=${{ matrix.python-version }} --output-folder .
129122
- uses: actions/upload-artifact@v4
130123
with:
131-
name: cil-package-py${{ matrix.python-version }}-np${{ matrix.numpy-version }}
124+
name: cil-package-py${{ matrix.python-version }}
132125
path: recipe/linux-64/cil*
133126
- name: anaconda upload -c ccpi
134127
if: github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags')

0 commit comments

Comments
 (0)