Skip to content

Commit

Permalink
Merge branch 'master' into fista_docs
Browse files Browse the repository at this point in the history
  • Loading branch information
MargaretDuff authored Dec 17, 2024
2 parents 828df73 + b4d178a commit a5e58d8
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
conda env remove -n "${{ steps.reqs.outputs.envname }}"
test:
defaults: {run: {shell: 'bash -el {0}'}}
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
strategy:
matrix:
include:
Expand All @@ -88,7 +88,7 @@ jobs:
- name: test
run: python -m unittest discover -v ./Wrappers/Python/test
conda-matrix:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
outputs:
python-version: ${{ steps.matrix.outputs.python-version }}
numpy-version: ${{ steps.matrix.outputs.numpy-version }}
Expand All @@ -104,7 +104,7 @@ jobs:
fi
conda:
defaults: {run: {shell: 'bash -el {0}'}}
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
needs: conda-matrix
strategy:
matrix:
Expand Down Expand Up @@ -148,7 +148,7 @@ jobs:
conda-reindex:
if: startsWith(github.ref, 'refs/tags')
needs: conda
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: conda index tomography.stfc.ac.uk/conda
run: |
Expand All @@ -158,7 +158,7 @@ jobs:
'bash -lic "conda index --bz2 --zst --run-exports --channeldata --rss -n ccpi ${{ secrets.STFC_SSH_CONDA_DIR }}"'
docs:
defaults: {run: {shell: 'bash -el {0}', working-directory: docs}}
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -212,7 +212,7 @@ jobs:
dir: docs/build
nojekyll: true
docker:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
permissions:
contents: read
packages: write
Expand Down Expand Up @@ -264,5 +264,5 @@ jobs:
labels: ${{ steps.meta.outputs.labels }}
pass:
needs: [test-cuda, test, conda, docs, docker]
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps: [{run: echo success}]
2 changes: 1 addition & 1 deletion .github/workflows/skip.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ on:
- 'README.md'
jobs:
pass:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps: [{run: echo success}]

0 comments on commit a5e58d8

Please sign in to comment.