neoris/core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into dev

Browse Source
This commit is contained in:
Ingo Oppermann 2024-04-05 11:46:04 +02:00
commit 7ed99f1ae7
No known key found for this signature in database
GPG Key ID: 2AB32426E9DD229E
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/build_base.yaml vendored
View File

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

2
.github/workflows/build_base_dev.yaml vendored
View File

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

20
.github/workflows/build_bundle.yaml vendored
View File

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

8
.github/workflows/build_bundle_dev.yaml vendored
View File

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