diff --git a/.cirrus.yml b/.cirrus.yml index d83fe933bc..e9efcc52e2 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -37,7 +37,7 @@ env: UBUNTU_PRIOR_IMAGE_NAME: "ubuntu-2204-jammy-v20240319" UBUNTU_PRIOR2_IMAGE_NAME: "ubuntu-2004-focal-v20240307b" UBUNTU_PRIOR3_IMAGE_NAME: "ubuntu-1804-bionic-v20240116a" - UBUNTU_SNAP_IMAGE_NAME: "ubuntu-2204-jammy-v20240319" + UBUNTU_SNAP_IMAGE_NAME: "ubuntu-2404-noble-amd64-v20240423" UBUNTU_DEVEL_FAMILY_NAME: "ubuntu-2404-lts-amd64" # Curl-command prefix for downloading task artifacts, simply add the diff --git a/.github/workflows/snap.yaml b/.github/workflows/snap.yaml index d7d8935232..18ec8bafbf 100644 --- a/.github/workflows/snap.yaml +++ b/.github/workflows/snap.yaml @@ -9,7 +9,7 @@ on: jobs: build: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 concurrency: group: snap-build cancel-in-progress: true diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index eae5572fb5..9c57b1c11c 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -5,12 +5,12 @@ description: | primarily aimed at Linux distributions and other UNIX-like operating systems. grade: stable -base: core22 +base: core24 confinement: classic adopt-info: sos license: GPL-2.0-or-later environment: - PYTHONPATH: ${SNAP}/lib/python3.10/site-packages:${SNAP}/usr/lib/python3/dist-packages:${PYTHONPATH} + PYTHONPATH: ${SNAP}/lib/python3.12/site-packages:${SNAP}/usr/lib/python3/dist-packages:${PYTHONPATH} parts: sos: @@ -24,13 +24,12 @@ parts: build-packages: - git - python3 - - snapcraft - gettext - python3-venv stage-packages: - - python3.10-minimal - - libpython3.10-minimal - - libpython3.10-stdlib + - python3.12-minimal + - libpython3.12-minimal + - libpython3.12-stdlib python-packages: - pip - setuptools