Skip to content

Commit

Permalink
BEHAVIOR: switch to ubuntu-24.04 (#86)
Browse files Browse the repository at this point in the history
  • Loading branch information
redeboer authored Oct 9, 2024
1 parent d7a2a93 commit 3d758c6
Show file tree
Hide file tree
Showing 12 changed files with 27 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
push-to-version-branches:
name: Push to version branches
if: startsWith(github.ref, 'refs/tags') && !github.event.release.prerelease
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- name: Configure Git credentials
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
permissions:
pages: write
id-token: write
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- id: deployment
uses: actions/deploy-pages@v4
2 changes: 1 addition & 1 deletion .github/workflows/close-milestone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on:

jobs:
close-milestone:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: mhutchie/update-milestone-on-release@master
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docnb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
jobs:
docnb:
name: Execute and build documentation
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- uses: ComPWA/actions/pip-install@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/get-pypi-name.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
package-name:
if: startsWith(github.ref, 'refs/tags')
name: Determine package name
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
outputs:
name: ${{ steps.package-name.outputs.name }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linkcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
jobs:
linkcheck:
name: Check external links
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- uses: ComPWA/actions/pip-install@v1
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr-linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
check-labels:
if: github.event.pull_request.state == 'open'
name: Check labels
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: docker://agilepathway/pull-request-label-checker:latest # cspell:ignore agilepathway
with:
Expand All @@ -26,7 +26,7 @@ jobs:
check-title:
if: github.event.pull_request.state == 'open'
name: Check title
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- run: npm install @compwa/commitlint-config
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
outputs:
skipped-hooks: ${{ steps.hooks.outputs.skipped-hooks }}
taplo-version: ${{ steps.taplo.outputs.taplo-version }}
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- id: hooks
uses: ComPWA/actions/get-skipped-pre-commit-hooks@v1
Expand All @@ -42,7 +42,7 @@ jobs:
if: >-
${{ needs.determine-hooks.outputs.skipped-hooks != '' && needs.determine-hooks.outputs.skipped-hooks != 'taplo' }}
needs: determine-hooks
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
Expand Down Expand Up @@ -113,7 +113,7 @@ jobs:
if: needs.determine-hooks.outputs.taplo-version != ''
name: Run taplo through pre-commit
needs: determine-hooks
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- run: git config --global --add safe.directory $(pwd)
Expand Down Expand Up @@ -153,7 +153,7 @@ jobs:
needs:
- pre-commit
- taplo
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/push-to-version-branches.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ jobs:
push:
name: Push to version branches
if: startsWith(github.ref, 'refs/tags') && !github.event.release.prerelease
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- name: Configure Git credentials
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
name: Determine job matrix
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- id: set-matrix
uses: ComPWA/actions/create-pytest-matrix@v1
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
github.event.pull_request.head.repo.full_name == github.repository
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- id: set-matrix
uses: ComPWA/actions/create-python-version-matrix@v1
Expand All @@ -49,7 +49,7 @@ jobs:
github.event_name == 'schedule' ||
github.event_name == 'workflow_dispatch' ||
github.event.pull_request.head.repo.full_name == github.repository
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- uses: ComPWA/update-pre-commit@v1
Expand All @@ -58,7 +58,7 @@ jobs:
name: Check if PR already exists
outputs:
exists: ${{ steps.pr-exists.outputs.exists }}
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- name: List open pull requests
Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:
push:
name: Push changes
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
needs:
- pip-constraints
- pr-exists
Expand Down
12 changes: 9 additions & 3 deletions create-pytest-matrix/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def _format_skipped_version(skipped_python_versions: str) -> set[str] | None:
return set(skipped_python_versions.split(" "))


def create_job_matrix(
def create_job_matrix( # noqa: C901
coverage_python_version: str,
coverage_target: str,
macos_python_version: str,
Expand Down Expand Up @@ -66,11 +66,17 @@ def create_job_matrix(
"python-version": "3.6",
"runs-on": "ubuntu-20.04",
})
if "3.7" in python_versions:
python_versions.remove("3.7")
includes.append({
"python-version": "3.7",
"runs-on": "ubuntu-22.04",
})
if coverage_target:
includes.append({
"coverage-target": coverage_target,
"python-version": coverage_python_version,
"runs-on": "ubuntu-22.04",
"runs-on": "ubuntu-24.04",
})
if macos_python_version:
includes.append({
Expand All @@ -81,7 +87,7 @@ def create_job_matrix(
if python_versions:
matrix = {
"python-version": python_versions,
"runs-on": ["ubuntu-22.04"],
"runs-on": ["ubuntu-24.04"],
}
if includes:
matrix["include"] = includes
Expand Down

0 comments on commit 3d758c6

Please sign in to comment.