Skip to content

Commit

Permalink
CI: bump to Ubuntu 24.04 and Python 3.12
Browse files Browse the repository at this point in the history
  • Loading branch information
whot committed Jun 6, 2024
1 parent 0b37ee5 commit cefa01d
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/check-for-sysinfo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ permissions:

jobs:
checksysinfo:
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/label-commenter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ permissions:

jobs:
comment:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- name: Label Commenter
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ env:

jobs:
build-and-dist:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
strategy:
matrix:
compiler:
Expand All @@ -28,7 +28,7 @@ jobs:
# install python so we get pip for meson
- uses: actions/setup-python@v5
with:
python-version: '3.10'
python-version: '3.12'
- uses: ./.github/actions/pkginstall
with:
apt: $UBUNTU_PACKAGES
Expand Down Expand Up @@ -71,13 +71,13 @@ jobs:
# valgrind run
#
valgrind:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
# install python so we get pip for meson
- uses: actions/setup-python@v5
with:
python-version: '3.10'
python-version: '3.12'
- uses: ./.github/actions/pkginstall
with:
apt: $UBUNTU_PACKAGES
Expand All @@ -102,7 +102,7 @@ jobs:
# /etc/ loading check
etcdir:
needs: build-and-dist
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
strategy:
matrix:
command:
Expand All @@ -120,7 +120,7 @@ jobs:
# install python so we get pip for meson
- uses: actions/setup-python@v5
with:
python-version: '3.10'
python-version: '3.12'
# Run as sudo because we install to /etc and thus need the pip
# packages available to root
- uses: ./.github/actions/pkginstall
Expand Down Expand Up @@ -148,13 +148,13 @@ jobs:
# duplicate device check
duplicate-devices:
needs: build-and-dist
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
# install python so we get pip for meson
- uses: actions/setup-python@v5
with:
python-version: '3.10'
python-version: '3.12'
# Run as sudo because we install to /etc and thus need the pip
# packages available to root
- uses: ./.github/actions/pkginstall
Expand Down Expand Up @@ -196,7 +196,7 @@ jobs:
#
build-from-tarball:
needs: build-and-dist
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
env:
TARBALLDIR: '_tarball_dir'
INSTALLDIR: '/tmp/libwacom/_inst'
Expand All @@ -205,7 +205,7 @@ jobs:
- name: install python
uses: actions/setup-python@v5
with:
python-version: '3.10'
python-version: '3.12'
- uses: ./.github/actions/pkginstall
with:
apt: $UBUNTU_PACKAGES
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ env:

jobs:
deploy:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
permissions:
contents: write
steps:
Expand All @@ -25,7 +25,7 @@ jobs:
# install python so we get pip for meson
- uses: actions/setup-python@v5
with:
python-version: '3.10'
python-version: '3.12'
- uses: ./.github/actions/pkginstall
with:
apt: $UBUNTU_PACKAGES
Expand Down

0 comments on commit cefa01d

Please sign in to comment.