diff --git a/.github/workflows/build-packages.yaml b/.github/workflows/build-packages.yaml index 2bba4ca9..0ab6b5df 100644 --- a/.github/workflows/build-packages.yaml +++ b/.github/workflows/build-packages.yaml @@ -10,7 +10,7 @@ jobs: build-packages: strategy: matrix: - target-os: [ debian-12, ubuntu-2204, ubuntu-2404, fedora-42, fedora-43, arch, opensuse-tumbleweed ] + target-os: [ debian-13, ubuntu-2404, fedora-42, fedora-43, arch, opensuse-tumbleweed ] recipe: [ lact, lact-headless ] include: - target-os: rhel-8 diff --git a/.pkger.yml b/.pkger.yml index ab439ea4..0ab83fb9 100644 --- a/.pkger.yml +++ b/.pkger.yml @@ -8,7 +8,7 @@ gpg_key: /tmp/package-signing-key.gpg gpg_name: Ilya Zlobintsev ssh: ~ images: - - name: debian-12 + - name: debian-13 target: deb os: Debian - name: fedora-42 @@ -16,9 +16,6 @@ images: - name: fedora-43 target: rpm os: Fedora - - name: ubuntu-2204 - target: deb - os: Ubuntu - name: ubuntu-2404 target: deb os: Ubuntu diff --git a/pkg/images/debian-12/Dockerfile b/pkg/images/debian-12/Dockerfile deleted file mode 100644 index de18aff9..00000000 --- a/pkg/images/debian-12/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -FROM docker.io/debian:bookworm diff --git a/pkg/images/debian-13/Dockerfile b/pkg/images/debian-13/Dockerfile new file mode 100644 index 00000000..1e6c0cd8 --- /dev/null +++ b/pkg/images/debian-13/Dockerfile @@ -0,0 +1 @@ +FROM docker.io/debian:trixie diff --git a/pkg/images/ubuntu-2204/Dockerfile b/pkg/images/ubuntu-2204/Dockerfile deleted file mode 100644 index f4c827f5..00000000 --- a/pkg/images/ubuntu-2204/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -FROM docker.io/ubuntu:22.04 diff --git a/pkg/recipes/lact-headless/recipe.yml b/pkg/recipes/lact-headless/recipe.yml index cae0444f..ca0647a6 100644 --- a/pkg/recipes/lact-headless/recipe.yml +++ b/pkg/recipes/lact-headless/recipe.yml @@ -12,13 +12,13 @@ metadata: conflicts: [ lact, lact-libadwaita ] depends: all: [ hwdata, vulkan-tools, clinfo ] - debian-12+ubuntu-2204+ubuntu-2404: [ libdrm-amdgpu1, libdrm2 ] + debian-13+ubuntu-2404: [ libdrm-amdgpu1, libdrm2 ] fedora-42+fedora-43+rhel-8+rhel-9: [ libdrm ] arch: [ libdrm, ocl-icd ] opensuse-tumbleweed: [ libdrm ] build_depends: all: [ curl, make, clang, git, vulkan-tools, clinfo ] - debian-12+ubuntu-2204+ubuntu-2404: [ pkg-config, build-essential, libdrm-dev, dbus ] + debian-13+ubuntu-2404: [ pkg-config, build-essential, libdrm-dev, dbus ] fedora-42+fedora-43: [ gcc, libdrm-devel, dbus ] rhel-8+rhel-9: [ gcc, libdrm-devel, dbus ] arch: [ libdrm, dbus ] diff --git a/pkg/recipes/lact/recipe.yml b/pkg/recipes/lact/recipe.yml index b0937216..5f656b83 100644 --- a/pkg/recipes/lact/recipe.yml +++ b/pkg/recipes/lact/recipe.yml @@ -12,13 +12,13 @@ metadata: conflicts: [ lact-headless, lact-libadwaita ] depends: all: [ hwdata, vulkan-tools, clinfo ] - debian-12+ubuntu-2204+ubuntu-2404: [ libgtk-4-1, libdrm2, libdrm-amdgpu1 ] + debian-13+ubuntu-2404: [ libgtk-4-1, libdrm2, libdrm-amdgpu1 ] fedora-42+fedora-43: [ gtk4, libdrm ] arch: [ gtk4, ocl-icd ] opensuse-tumbleweed: [ gtk4 ] build_depends: all: [ curl, make, clang, git, vulkan-tools, clinfo ] - debian-12+ubuntu-2204+ubuntu-2404: [ libgtk-4-dev, pkg-config, build-essential, libdrm-dev, dbus ] + debian-13+ubuntu-2404: [ libgtk-4-dev, pkg-config, build-essential, libdrm-dev, dbus ] fedora-42+fedora-43: [ gtk4-devel, gcc, libdrm-devel, dbus ] arch: [ gtk4, dbus, ocl-icd ] opensuse-tumbleweed: [ gtk4-devel, libdrm-devel ]