Remove ubuntu22 build, remove cuda11 builds, bundle with ffmpeg7.1

datarhei · Nov 29, 2024 · 37b99e7 · 37b99e7
1 parent 6f3e2ca
commit 37b99e7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 17 deletions.
diff --git a/.github/workflows/build_base_dev.yaml b/.github/workflows/build_base_dev.yaml
@@ -20,11 +20,6 @@ jobs:
                       golang: golang:1.23-alpine3.20
                       platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6
                       branch: dev
-                    - os: ubuntu
-                      os_version: "22.04"
-                      golang: golang:1.23-alpine3.20
-                      platforms: linux/amd64
-                      branch: dev
                     - os: ubuntu
                       os_version: "24.04"
                       golang: golang:1.23-alpine3.20

diff --git a/.github/workflows/build_bundle_dev.yaml b/.github/workflows/build_bundle_dev.yaml
@@ -14,36 +14,28 @@ jobs:
             matrix:
                 include:
                     - core_os: alpine3.20
-                      ffmpeg: "6.1.1"
+                      ffmpeg: "7.1"
                       ffmpeg_os: alpine3.20
                       platforms: linux/amd64,linux/arm64,linux/arm/v7
                       branch: dev
                       prefix:
                       latest: yes
                     - core_os: alpine3.20
-                      ffmpeg: "6.1.1-rpi"
+                      ffmpeg: "7.1-rpi"
                       ffmpeg_os: alpine3.20
                       platforms: linux/arm64,linux/arm/v7
                       branch: dev
                       prefix: rpi-
                       latest: yes
                     - core_os: ubuntu24.04
-                      ffmpeg: "6.1.1-vaapi"
+                      ffmpeg: "7.1-vaapi"
                       ffmpeg_os: ubuntu24.04
                       platforms: linux/amd64
                       branch: dev
                       prefix: vaapi-
                       latest: yes
-                    - core_os: ubuntu22.04
-                      ffmpeg: "6.1.1-cuda"
-                      ffmpeg_os: ubuntu22.04
-                      ffmpeg_tags: "-cuda11.8.0"
-                      platforms: linux/amd64
-                      branch: dev
-                      prefix: cuda-
-                      latest: no
                     - core_os: ubuntu24.04
-                      ffmpeg: "6.1.1-cuda"
+                      ffmpeg: "7.1-cuda"
                       ffmpeg_os: ubuntu24.04
                       ffmpeg_tags: "-cuda12.6.1"
                       platforms: linux/amd64