Skip to content

Commit

Permalink
Merge pull request scipp#86 from scipp/ubuntu2204
Browse files Browse the repository at this point in the history
ubuntu-20.04 -> ubuntu-22.04
  • Loading branch information
nvaytet authored Nov 14, 2023
2 parents 3ad29de + b54b0e4 commit 5f14842
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 18 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
jobs:
formatting:
name: Formatting and static analysis
runs-on: 'ubuntu-20.04'
runs-on: 'ubuntu-22.04'
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
Expand All @@ -27,7 +27,7 @@ jobs:
tests:
name: Tests
needs: formatting
runs-on: 'ubuntu-20.04'
runs-on: 'ubuntu-22.04'
env:
DUMMYPROJECTPATH: './test-dummy'
steps:
Expand Down
4 changes: 2 additions & 2 deletions template/.github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
jobs:
formatting:
name: Formatting and static analysis
runs-on: 'ubuntu-20.04'
runs-on: 'ubuntu-22.04'
outputs:
min_python: ${{ steps.vars.outputs.min_python }}
min_tox_env: ${{ steps.vars.outputs.min_tox_env }}
Expand All @@ -39,7 +39,7 @@ jobs:
needs: formatting
strategy:
matrix:
os: ['ubuntu-20.04']
os: ['ubuntu-22.04']
python:
- version: '${{needs.formatting.outputs.min_python}}'
tox-env: '${{needs.formatting.outputs.min_tox_env}}'
Expand Down
2 changes: 1 addition & 1 deletion template/.github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ env:
jobs:
docs:
name: Build documentation
runs-on: 'ubuntu-20.04'
runs-on: 'ubuntu-22.04'
steps:
- run: sudo apt install --yes graphviz pandoc
- uses: actions/checkout@v3
Expand Down
4 changes: 2 additions & 2 deletions template/.github/workflows/nightly_at_main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
jobs:
setup:
name: Setup variables
runs-on: 'ubuntu-20.04'
runs-on: 'ubuntu-22.04'
outputs:
min_python: ${{ steps.vars.outputs.min_python }}
steps:
Expand All @@ -25,7 +25,7 @@ jobs:
needs: setup
strategy:
matrix:
os: ['ubuntu-20.04']
os: ['ubuntu-22.04']
python:
- version: '${{needs.setup.outputs.min_python}}'
tox-env: 'nightly'
Expand Down
4 changes: 2 additions & 2 deletions template/.github/workflows/nightly_at_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
jobs:
setup:
name: Setup variables
runs-on: 'ubuntu-20.04'
runs-on: 'ubuntu-22.04'
outputs:
min_python: ${{ steps.vars.outputs.min_python }}
release_tag: ${{ steps.release.outputs.release_tag }}
Expand All @@ -31,7 +31,7 @@ jobs:
needs: setup
strategy:
matrix:
os: ['ubuntu-20.04']
os: ['ubuntu-22.04']
python:
- version: '${{needs.setup.outputs.min_python}}'
tox-env: 'nightly'
Expand Down
10 changes: 5 additions & 5 deletions template/.github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ defaults:
jobs:
build_conda:
name: Conda build
runs-on: 'ubuntu-20.04'
runs-on: 'ubuntu-22.04'

steps:
- uses: actions/checkout@v3
Expand All @@ -38,7 +38,7 @@ jobs:

build_wheels:
name: Wheels
runs-on: 'ubuntu-20.04'
runs-on: 'ubuntu-22.04'

steps:
- uses: actions/checkout@v3
Expand All @@ -64,7 +64,7 @@ jobs:
upload_pypi:
name: Deploy PyPI
needs: [build_wheels, build_conda]
runs-on: 'ubuntu-20.04'
runs-on: 'ubuntu-22.04'
environment: release
permissions:
id-token: write
Expand All @@ -76,7 +76,7 @@ jobs:
upload_conda:
name: Deploy Conda
needs: [build_wheels, build_conda]
runs-on: 'ubuntu-20.04'
runs-on: 'ubuntu-22.04'
if: github.event_name == 'release' && github.event.action == 'published'

steps:
Expand All @@ -100,7 +100,7 @@ jobs:
assets:
name: Upload docs
needs: docs
runs-on: 'ubuntu-20.04'
runs-on: 'ubuntu-22.04'
permissions:
contents: write # This is needed so that the action can upload the asset
steps:
Expand Down
4 changes: 2 additions & 2 deletions template/.github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
workflow_dispatch:
inputs:
os-variant:
default: 'ubuntu-20.04'
default: 'ubuntu-22.04'
type: string
python-version:
type: string
Expand All @@ -26,7 +26,7 @@ on:
workflow_call:
inputs:
os-variant:
default: 'ubuntu-20.04'
default: 'ubuntu-22.04'
type: string
python-version:
type: string
Expand Down
4 changes: 2 additions & 2 deletions template/.github/workflows/unpinned.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
jobs:
setup:
name: Setup variables
runs-on: 'ubuntu-20.04'
runs-on: 'ubuntu-22.04'
outputs:
min_python: ${{ steps.vars.outputs.min_python }}
release_tag: ${{ steps.release.outputs.release_tag }}
Expand All @@ -31,7 +31,7 @@ jobs:
needs: setup
strategy:
matrix:
os: ['ubuntu-20.04']
os: ['ubuntu-22.04']
python:
- version: '${{needs.setup.outputs.min_python}}'
tox-env: 'unpinned'
Expand Down

0 comments on commit 5f14842

Please sign in to comment.