Merge branch 'main' into dev

Author: ioppermann

.github/workflows/build_base.yaml

@@ -37,14 +37,14 @@ jobs:
                     - core: ${{ needs.versions.outputs.coreversion }}
                       os: alpine
                       os_version: "3.19"
-                      golang: golang:1.21-alpine3.19
+                      golang: golang:1.22-alpine3.19
                       platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6
                       branch: main
                       latest: yes
                     - core: ${{ needs.versions.outputs.coreversion }}
                       os: ubuntu
-                      os_version: "20.04"
-                      golang: golang:1.21-alpine3.19
+                      os_version: "22.04"
+                      golang: golang:1.22-alpine3.19
                       platforms: linux/amd64
                       branch: main
                       latest: yes

.github/workflows/build_base_dev.yaml

@@ -21,7 +21,7 @@ jobs:
                       platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6
                       branch: dev
                     - os: ubuntu
-                      os_version: "20.04"
+                      os_version: "22.04"
                       golang: golang:1.22-alpine3.19
                       platforms: linux/amd64
                       branch: dev

.github/workflows/build_bundle.yaml

@@ -36,32 +36,32 @@ jobs:
                 include:
                     - core: ${{ needs.versions.outputs.coreversion }}
                       core_os: alpine3.19
-                      ffmpeg: "5.1.3"
-                      ffmpeg_os: alpine3.16
+                      ffmpeg: "6.1.1"
+                      ffmpeg_os: alpine3.19
                       platforms: linux/amd64,linux/arm64,linux/arm/v7
                       branch: main
                       prefix:
                       latest: yes
                     - core: ${{ needs.versions.outputs.coreversion }}
                       core_os: alpine3.19
-                      ffmpeg: "5.1.3-rpi"
-                      ffmpeg_os: alpine3.16
+                      ffmpeg: "6.1.1-rpi"
+                      ffmpeg_os: alpine3.19
                       platforms: linux/arm64,linux/arm/v7
                       branch: main
                       prefix: rpi-
                       latest: yes
                     - core: ${{ needs.versions.outputs.coreversion }}
-                      core_os: ubuntu20.04
-                      ffmpeg: "5.1.3-vaapi"
-                      ffmpeg_os: ubuntu20.04
+                      core_os: ubuntu22.04
+                      ffmpeg: "6.1.1-vaapi"
+                      ffmpeg_os: ubuntu22.04
                       platforms: linux/amd64
                       branch: main
                       prefix: vaapi-
                       latest: yes
                     - core: ${{ needs.versions.outputs.coreversion }}
-                      core_os: ubuntu20.04
-                      ffmpeg: "5.1.3-cuda"
-                      ffmpeg_os: ubuntu20.04
+                      core_os: ubuntu22.04
+                      ffmpeg: "6.1.1-cuda"
+                      ffmpeg_os: ubuntu22.04
                       ffmpeg_tags: "-cuda11.7.1"
                       platforms: linux/amd64
                       branch: main

.github/workflows/build_bundle_dev.yaml

@@ -27,16 +27,16 @@ jobs:
                       branch: dev
                       prefix: rpi-
                       latest: yes
-                    - core_os: ubuntu20.04
+                    - core_os: ubuntu22.04
                       ffmpeg: "6.1.1-vaapi"
-                      ffmpeg_os: ubuntu20.04
+                      ffmpeg_os: ubuntu22.04
                       platforms: linux/amd64
                       branch: dev
                       prefix: vaapi-
                       latest: yes
-                    - core_os: ubuntu20.04
+                    - core_os: ubuntu22.04
                       ffmpeg: "6.1.1-cuda"
-                      ffmpeg_os: ubuntu20.04
+                      ffmpeg_os: ubuntu22.04
                       ffmpeg_tags: "-cuda11.7.1"
                       platforms: linux/amd64
                       branch: dev