From fa7e38dde3750a0cfba17f6877d8b1c3ff386da0 Mon Sep 17 00:00:00 2001
From: Ilya Zlobintsev <ilya.zl@protonmail.com>
Date: Sat, 18 Apr 2026 16:41:44 +0300
Subject: [PATCH] pkg: add fedora 44 and ubuntu 26.04 builds, add cache for
 docker images (#961)

* pkg: add fedora 44 and ubuntu 26.04, add cache for docker images

* fix: syntax

* fix: add image to config

* fix: use maintained action

* fix

* fix: use unique cache key

* fix: add rpmsign
---
 .github/workflows/build-packages.yaml          | 7 ++++++-
 .pkger.yml                                     | 7 +++++--
 pkg/images/fedora-43/Dockerfile                | 2 ++
 pkg/images/{fedora-42 => fedora-44}/Dockerfile | 2 +-
 pkg/images/ubuntu-2604/Dockerfile              | 1 +
 pkg/recipes/lact-headless/recipe.yml           | 8 ++++----
 pkg/recipes/lact/recipe.yml                    | 8 ++++----
 7 files changed, 23 insertions(+), 12 deletions(-)
 rename pkg/images/{fedora-42 => fedora-44}/Dockerfile (50%)
 create mode 100644 pkg/images/ubuntu-2604/Dockerfile

diff --git a/.github/workflows/build-packages.yaml b/.github/workflows/build-packages.yaml
index 931f1ed9..9c169f2b 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-13, ubuntu-2404, fedora-42, fedora-43, arch, opensuse-tumbleweed ]
+        target-os: [ debian-13, ubuntu-2404, ubuntu-2604, fedora-43, fedora-44, arch, opensuse-tumbleweed ]
         recipe: [ lact, lact-headless ]
         include:
           - target-os: rhel-8
@@ -22,6 +22,11 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
 
+      - name: Docker Cache
+        uses: AndreKurait/docker-cache@0.6.0
+        with:
+          key: docker-${{ matrix.target-os }}-${{ hashFiles('pkg/images/') }}
+
       - name: Import gpg key
         run: |
           echo -n "$GPG_KEY" | base64 -d > /tmp/package-signing-key.gpg
diff --git a/.pkger.yml b/.pkger.yml
index 0ab83fb9..8ce591ff 100644
--- a/.pkger.yml
+++ b/.pkger.yml
@@ -11,14 +11,17 @@ images:
   - name: debian-13
     target: deb
     os: Debian
-  - name: fedora-42
-    target: rpm
   - name: fedora-43
     target: rpm
+  - name: fedora-44
+    target: rpm
     os: Fedora
   - name: ubuntu-2404
     target: deb
     os: Ubuntu
+  - name: ubuntu-2604
+    target: deb
+    os: Ubuntu
   - name: arch
     target: pkg
     os: Arch Linux
diff --git a/pkg/images/fedora-43/Dockerfile b/pkg/images/fedora-43/Dockerfile
index 7c5fa86c..d31724d0 100644
--- a/pkg/images/fedora-43/Dockerfile
+++ b/pkg/images/fedora-43/Dockerfile
@@ -1 +1,3 @@
 FROM quay.io/fedora/fedora:43
+RUN dnf install -y gpg rpmsign
+
diff --git a/pkg/images/fedora-42/Dockerfile b/pkg/images/fedora-44/Dockerfile
similarity index 50%
rename from pkg/images/fedora-42/Dockerfile
rename to pkg/images/fedora-44/Dockerfile
index 721dc786..cc4ee9fc 100644
--- a/pkg/images/fedora-42/Dockerfile
+++ b/pkg/images/fedora-44/Dockerfile
@@ -1,2 +1,2 @@
-FROM quay.io/fedora/fedora:42
+FROM quay.io/fedora/fedora:44
 RUN dnf install -y gpg rpmsign
diff --git a/pkg/images/ubuntu-2604/Dockerfile b/pkg/images/ubuntu-2604/Dockerfile
new file mode 100644
index 00000000..5a7d7287
--- /dev/null
+++ b/pkg/images/ubuntu-2604/Dockerfile
@@ -0,0 +1 @@
+FROM docker.io/ubuntu:26.04
diff --git a/pkg/recipes/lact-headless/recipe.yml b/pkg/recipes/lact-headless/recipe.yml
index 923cecc4..ef716326 100644
--- a/pkg/recipes/lact-headless/recipe.yml
+++ b/pkg/recipes/lact-headless/recipe.yml
@@ -12,14 +12,14 @@ metadata:
   conflicts: [ lact ]
   depends:
     all: [ hwdata, vulkan-tools, clinfo ]
-    debian-13+ubuntu-2404: [ libdrm-amdgpu1, libdrm2 ]
-    fedora-42+fedora-43+rhel-8+rhel-9: [ libdrm ]
+    debian-13+ubuntu-2404+ubuntu-2604: [ libdrm-amdgpu1, libdrm2 ]
+    fedora-43+fedora-44+rhel-8+rhel-9: [ libdrm ]
     arch: [ libdrm, ocl-icd ]
     opensuse-tumbleweed: [ libdrm ]
   build_depends:
     all: [ curl, make, clang, git, vulkan-tools, clinfo ]
-    debian-13+ubuntu-2404: [ pkg-config, build-essential, libdrm-dev, dbus ]
-    fedora-42+fedora-43: [ gcc, libdrm-devel, dbus ]
+    debian-13+ubuntu-240+ubuntu-26044: [ pkg-config, build-essential, libdrm-dev, dbus ]
+    fedora-43+fedora-44: [ gcc, libdrm-devel, dbus ]
     rhel-8+rhel-9: [ gcc, libdrm-devel, dbus ]
     arch: [ libdrm, dbus ]
     opensuse-tumbleweed: [ libdrm-devel ]
diff --git a/pkg/recipes/lact/recipe.yml b/pkg/recipes/lact/recipe.yml
index 56642010..08317df6 100644
--- a/pkg/recipes/lact/recipe.yml
+++ b/pkg/recipes/lact/recipe.yml
@@ -12,14 +12,14 @@ metadata:
   conflicts: [ lact-headless ]
   depends:
     all: [ hwdata, vulkan-tools, clinfo ]
-    debian-13+ubuntu-2404: [ libgtk-4-1, libdrm2, libdrm-amdgpu1, libadwaita-1-0 ]
-    fedora-42+fedora-43: [ gtk4, libdrm, libadwaita ]
+    debian-13+ubuntu-2404+ubuntu-2604: [ libgtk-4-1, libdrm2, libdrm-amdgpu1, libadwaita-1-0 ]
+    fedora-43+fedora-44: [ gtk4, libdrm, libadwaita ]
     arch: [ gtk4, ocl-icd, libadwaita ]
     opensuse-tumbleweed: [ gtk4, libadwaita-1-0 ]
   build_depends:
     all: [ curl, make, clang, git, vulkan-tools, clinfo ]
-    debian-13+ubuntu-2404: [ libgtk-4-dev, pkg-config, build-essential, libdrm-dev, dbus, libadwaita-1-dev ]
-    fedora-42+fedora-43: [ gtk4-devel, gcc, libdrm-devel, dbus, libadwaita-devel ]
+    debian-13+ubuntu-2404+ubuntu-2604: [ libgtk-4-dev, pkg-config, build-essential, libdrm-dev, dbus, libadwaita-1-dev ]
+    fedora-43+fedora-44: [ gtk4-devel, gcc, libdrm-devel, dbus, libadwaita-devel ]
     arch: [ gtk4, dbus, ocl-icd, libadwaita ]
     opensuse-tumbleweed: [ gtk4-devel, libdrm-devel, libadwaita-devel ]
   all_images: true