Skip to content

Commit b4bf4d4

Browse files
committed
Merge branch 'main' into dev
2 parents 712a39b + 07221a2 commit b4bf4d4

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

.github/workflows/build_base_dev.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ jobs:
1616
matrix:
1717
include:
1818
- os: alpine
19-
os_version: "3.20"
20-
golang: golang:1.23-alpine3.20
19+
os_version: "3.21"
20+
golang: golang:1.23-alpine3.21
2121
platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6
2222
branch: dev
2323
- os: ubuntu
2424
os_version: "24.04"
25-
golang: golang:1.23-alpine3.20
25+
golang: golang:1.23-alpine3.21
2626
platforms: linux/amd64
2727
branch: dev
2828

.github/workflows/build_base_vod.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ jobs:
1414
matrix:
1515
include:
1616
- os: alpine
17-
os_version: "3.20"
18-
golang: golang:1.23-alpine3.20
17+
os_version: "3.21"
18+
golang: golang:1.23-alpine3.21
1919
platforms: linux/amd64,linux/arm64,linux/arm/v7
2020
branch: vod
2121
- os: ubuntu
2222
os_version: "24.04"
23-
golang: golang:1.23-alpine3.20
23+
golang: golang:1.23-alpine3.21
2424
platforms: linux/amd64
2525
branch: vod
2626

.github/workflows/build_bundle_dev.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@ jobs:
1313
strategy:
1414
matrix:
1515
include:
16-
- core_os: alpine3.20
16+
- core_os: alpine3.21
1717
ffmpeg: "7.1"
18-
ffmpeg_os: alpine3.20
18+
ffmpeg_os: alpine3.21
1919
platforms: linux/amd64,linux/arm64,linux/arm/v7
2020
branch: dev
2121
prefix:
2222
latest: yes
23-
- core_os: alpine3.20
23+
- core_os: alpine3.21
2424
ffmpeg: "7.1-rpi"
25-
ffmpeg_os: alpine3.20
25+
ffmpeg_os: alpine3.21
2626
platforms: linux/arm64,linux/arm/v7
2727
branch: dev
2828
prefix: rpi-
@@ -37,7 +37,7 @@ jobs:
3737
- core_os: ubuntu24.04
3838
ffmpeg: "7.1-cuda"
3939
ffmpeg_os: ubuntu24.04
40-
ffmpeg_tags: "-cuda12.6.1"
40+
ffmpeg_tags: "-cuda12.8.0"
4141
platforms: linux/amd64
4242
branch: dev
4343
prefix: cuda-

0 commit comments

Comments
 (0)