From 65beedd281f35474e6f42d367fd0a99dd9dd54de Mon Sep 17 00:00:00 2001
From: Ingo Oppermann <ingo@datarhei.com>
Date: Thu, 26 Sep 2024 14:13:59 +0200
Subject: [PATCH] Upgrade to ubuntu noble, add cuda 12 bundle

---
 .github/workflows/build_base_dev.yaml   |  5 +++++
 .github/workflows/build_base_vod.yaml   |  2 +-
 .github/workflows/build_bundle_dev.yaml | 14 +++++++++++---
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build_base_dev.yaml b/.github/workflows/build_base_dev.yaml
index fa315333..6f187f1c 100644
--- a/.github/workflows/build_base_dev.yaml
+++ b/.github/workflows/build_base_dev.yaml
@@ -25,6 +25,11 @@ jobs:
                       golang: golang:1.22-alpine3.20
                       platforms: linux/amd64
                       branch: dev
+                    - os: ubuntu
+                      os_version: "24.04"
+                      golang: golang:1.22-alpine3.20
+                      platforms: linux/amd64
+                      branch: dev
 
         steps:
             - name: Checkout
diff --git a/.github/workflows/build_base_vod.yaml b/.github/workflows/build_base_vod.yaml
index 523ee1a9..c0fd6b43 100644
--- a/.github/workflows/build_base_vod.yaml
+++ b/.github/workflows/build_base_vod.yaml
@@ -19,7 +19,7 @@ jobs:
                       platforms: linux/amd64,linux/arm64,linux/arm/v7
                       branch: vod
                     - os: ubuntu
-                      os_version: "22.04"
+                      os_version: "24.04"
                       golang: golang:1.22-alpine3.20
                       platforms: linux/amd64
                       branch: vod
diff --git a/.github/workflows/build_bundle_dev.yaml b/.github/workflows/build_bundle_dev.yaml
index cc0a1e2e..be81bfc2 100644
--- a/.github/workflows/build_bundle_dev.yaml
+++ b/.github/workflows/build_bundle_dev.yaml
@@ -27,9 +27,9 @@ jobs:
                       branch: dev
                       prefix: rpi-
                       latest: yes
-                    - core_os: ubuntu22.04
+                    - core_os: ubuntu24.04
                       ffmpeg: "6.1.1-vaapi"
-                      ffmpeg_os: ubuntu22.04
+                      ffmpeg_os: ubuntu24.04
                       platforms: linux/amd64
                       branch: dev
                       prefix: vaapi-
@@ -37,7 +37,15 @@ jobs:
                     - core_os: ubuntu22.04
                       ffmpeg: "6.1.1-cuda"
                       ffmpeg_os: ubuntu22.04
-                      ffmpeg_tags: "-cuda11.7.1"
+                      ffmpeg_tags: "-cuda11.8.0"
+                      platforms: linux/amd64
+                      branch: dev
+                      prefix: cuda-
+                      latest: yes
+                    - core_os: ubuntu24.04
+                      ffmpeg: "6.1.1-cuda"
+                      ffmpeg_os: ubuntu24.04
+                      ffmpeg_tags: "-cuda12.6.1"
                       platforms: linux/amd64
                       branch: dev
                       prefix: cuda-