Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 18 additions & 13 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7
- uses: actions/setup-python@v6
with:
python-version: "3.14"
- run: pip install pre-commit packaging
- uses: actions/cache@v5
- uses: actions/cache@v6
with:
path: ~/.cache/pre-commit
key: pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}
Expand All @@ -48,7 +48,7 @@ jobs:
build: ${{ steps.matrix.outputs.build }}
manifest: ${{ steps.matrix.outputs.manifest }}
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7
- id: matrix
run: |
echo "build=$(jq -c '.build' docker-images/github-actions-matrix.json)" >> "$GITHUB_OUTPUT"
Expand All @@ -63,7 +63,7 @@ jobs:
matrix:
include: ${{ fromJson(needs.generate-matrix.outputs.build) }}
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7
- uses: docker/setup-buildx-action@v4
- uses: docker/login-action@v4
if: github.event.pull_request.head.repo.full_name == github.repository || github.event_name != 'pull_request'
Expand Down Expand Up @@ -163,18 +163,11 @@ jobs:
docker buildx imagetools create -t "${tag}" ${GHCR_SOURCES}
done

deploy-docs:
if: github.event_name != 'pull_request'
build-docs:
needs: [lint]
runs-on: ubuntu-latest
permissions:
pages: write
id-token: write
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7
- name: Sync README and CONTRIBUTING to docs
run: |
mkdir -p docs
Expand All @@ -188,6 +181,18 @@ jobs:
source: ./docs
destination: ./_site
- uses: actions/upload-pages-artifact@v5

deploy-docs:
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
needs: [build-docs]
runs-on: ubuntu-latest
permissions:
pages: write
id-token: write
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v5
2 changes: 1 addition & 1 deletion .github/workflows/jekyll-gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v7
- name: Sync README and CONTRIBUTING to docs
run: |
mkdir -p docs
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ repos: # pre-commit autoupdate
- id: isort

- repo: https://github.com/psf/black
rev: 26.3.1
rev: 26.5.1
hooks:
- id: black
language_version: python3
Expand Down
2 changes: 1 addition & 1 deletion docker-images/8.0/alpine320/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ FROM alpine:3.20 AS builder
RUN apk add --no-cache --update libgcc libstdc++ ca-certificates openssl expat git less tree file vim bash


ENV FFMPEG_VERSION=8.0.2
ENV FFMPEG_VERSION=8.0.3

ENV MAKEFLAGS="-j4"
ENV PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconfig:/opt/ffmpeg/lib64/pkgconfig:/opt/ffmpeg/lib/x86_64-linux-gnu/pkgconfig:/opt/ffmpeg/lib/aarch64-linux-gnu/pkgconfig:/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/lib/pkgconfig"
Expand Down
2 changes: 1 addition & 1 deletion docker-images/8.0/nvidia2404/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ENV NVIDIA_DRIVER_CAPABILITIES=compute,utility,video
ENV DEBIAN_FRONTEND=noninteractive


ENV FFMPEG_VERSION=8.0.2
ENV FFMPEG_VERSION=8.0.3

ENV NVIDIA_HEADERS_VERSION=11.1.5.3

Expand Down
2 changes: 1 addition & 1 deletion docker-images/8.0/scratch320/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ RUN apk add --no-cache --update libgcc libstdc++ ca-certificates openssl
# apt-get install -yq --no-install-recommends curl jq python3 python3-requests less tree file vim && \


ENV FFMPEG_VERSION=8.0.2
ENV FFMPEG_VERSION=8.0.3

ENV MAKEFLAGS="-j4"
ENV PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconfig:/opt/ffmpeg/lib64/pkgconfig:/opt/ffmpeg/lib/x86_64-linux-gnu/pkgconfig:/opt/ffmpeg/lib/aarch64-linux-gnu/pkgconfig:/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/lib/pkgconfig"
Expand Down
2 changes: 1 addition & 1 deletion docker-images/8.0/ubuntu2404-edge/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ COPY build_source.sh /tmp/workdir
COPY install_ffmpeg.sh /tmp/workdir


ENV FFMPEG_VERSION=8.0.2
ENV FFMPEG_VERSION=8.0.3

# fribidi
ARG FRIBIDI_PKGS="libfribidi-dev libfribidi0"
Expand Down
2 changes: 1 addition & 1 deletion docker-images/8.0/ubuntu2404/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
FROM ubuntu:24.04 AS builder


ENV FFMPEG_VERSION=8.0.2
ENV FFMPEG_VERSION=8.0.3

## opencore-amr - https://sourceforge.net/projects/opencore-amr/
## x264 - http://www.videolan.org/developers/x264.html
Expand Down
2 changes: 1 addition & 1 deletion docker-images/8.0/vaapi2404/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ FROM ubuntu:24.04 AS builder



ENV FFMPEG_VERSION=8.0.2
ENV FFMPEG_VERSION=8.0.3

## opencore-amr - https://sourceforge.net/projects/opencore-amr/
## x264 - http://www.videolan.org/developers/x264.html
Expand Down
2 changes: 1 addition & 1 deletion docker-images/8.1/ubuntu2404/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
FROM ubuntu:24.04 AS builder


ENV FFMPEG_VERSION=8.1.1
ENV FFMPEG_VERSION=8.1.2

## opencore-amr - https://sourceforge.net/projects/opencore-amr/
## x264 - http://www.videolan.org/developers/x264.html
Expand Down
32 changes: 16 additions & 16 deletions docker-images/github-actions-matrix.json
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
{
"major_version": "8",
"version": "8.0",
"long_version": "8.0.2",
"long_version": "8.0.3",
"variant": "ubuntu2404",
"parent": "ubuntu",
"is_parent": "True",
Expand All @@ -146,7 +146,7 @@
{
"major_version": "8",
"version": "8.0",
"long_version": "8.0.2",
"long_version": "8.0.3",
"variant": "ubuntu2404",
"parent": "ubuntu",
"is_parent": "True",
Expand All @@ -159,7 +159,7 @@
{
"major_version": "8",
"version": "8.0",
"long_version": "8.0.2",
"long_version": "8.0.3",
"variant": "ubuntu2404-edge",
"parent": "ubuntu-edge",
"is_parent": "True",
Expand All @@ -172,7 +172,7 @@
{
"major_version": "8",
"version": "8.0",
"long_version": "8.0.2",
"long_version": "8.0.3",
"variant": "ubuntu2404-edge",
"parent": "ubuntu-edge",
"is_parent": "True",
Expand All @@ -185,7 +185,7 @@
{
"major_version": "8",
"version": "8.0",
"long_version": "8.0.2",
"long_version": "8.0.3",
"variant": "alpine320",
"parent": "alpine",
"is_parent": "True",
Expand All @@ -198,7 +198,7 @@
{
"major_version": "8",
"version": "8.0",
"long_version": "8.0.2",
"long_version": "8.0.3",
"variant": "alpine320",
"parent": "alpine",
"is_parent": "True",
Expand All @@ -211,7 +211,7 @@
{
"major_version": "8",
"version": "8.0",
"long_version": "8.0.2",
"long_version": "8.0.3",
"variant": "scratch320",
"parent": "scratch",
"is_parent": "True",
Expand All @@ -224,7 +224,7 @@
{
"major_version": "8",
"version": "8.0",
"long_version": "8.0.2",
"long_version": "8.0.3",
"variant": "scratch320",
"parent": "scratch",
"is_parent": "True",
Expand All @@ -237,7 +237,7 @@
{
"major_version": "8",
"version": "8.0",
"long_version": "8.0.2",
"long_version": "8.0.3",
"variant": "vaapi2404",
"parent": "vaapi",
"is_parent": "True",
Expand All @@ -250,7 +250,7 @@
{
"major_version": "8",
"version": "8.0",
"long_version": "8.0.2",
"long_version": "8.0.3",
"variant": "nvidia2404",
"parent": "nvidia",
"is_parent": "True",
Expand Down Expand Up @@ -325,7 +325,7 @@
{
"major_version": "8",
"version": "8.0",
"long_version": "8.0.2",
"long_version": "8.0.3",
"variant": "ubuntu2404",
"parent": "ubuntu",
"is_parent": "True",
Expand All @@ -335,7 +335,7 @@
{
"major_version": "8",
"version": "8.0",
"long_version": "8.0.2",
"long_version": "8.0.3",
"variant": "ubuntu2404-edge",
"parent": "ubuntu-edge",
"is_parent": "True",
Expand All @@ -345,7 +345,7 @@
{
"major_version": "8",
"version": "8.0",
"long_version": "8.0.2",
"long_version": "8.0.3",
"variant": "alpine320",
"parent": "alpine",
"is_parent": "True",
Expand All @@ -355,7 +355,7 @@
{
"major_version": "8",
"version": "8.0",
"long_version": "8.0.2",
"long_version": "8.0.3",
"variant": "scratch320",
"parent": "scratch",
"is_parent": "True",
Expand All @@ -365,7 +365,7 @@
{
"major_version": "8",
"version": "8.0",
"long_version": "8.0.2",
"long_version": "8.0.3",
"variant": "vaapi2404",
"parent": "vaapi",
"is_parent": "True",
Expand All @@ -375,7 +375,7 @@
{
"major_version": "8",
"version": "8.0",
"long_version": "8.0.2",
"long_version": "8.0.3",
"variant": "nvidia2404",
"parent": "nvidia",
"is_parent": "True",
Expand Down
24 changes: 12 additions & 12 deletions docker-images/gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,78 +85,78 @@ stages:
ISLATEST: "False"
PLATFORMS: "linux/amd64"

8.0.2-ubuntu2404:
8.0.3-ubuntu2404:
extends: .docker
stage: ubuntu
variables:
MAJOR_VERSION: 8
VERSION: "8.0"
LONG_VERSION: "8.0.2"
LONG_VERSION: "8.0.3"
VARIANT: ubuntu2404
PARENT: "ubuntu"
ISPARENT: "True"
ISLATEST: "True"
PLATFORMS: "linux/amd64,linux/arm64"

8.0.2-ubuntu2404-edge:
8.0.3-ubuntu2404-edge:
extends: .docker
stage: ubuntu-edge
variables:
MAJOR_VERSION: 8
VERSION: "8.0"
LONG_VERSION: "8.0.2"
LONG_VERSION: "8.0.3"
VARIANT: ubuntu2404-edge
PARENT: "ubuntu-edge"
ISPARENT: "True"
ISLATEST: "False"
PLATFORMS: "linux/amd64,linux/arm64"

8.0.2-alpine320:
8.0.3-alpine320:
extends: .docker
stage: alpine
variables:
MAJOR_VERSION: 8
VERSION: "8.0"
LONG_VERSION: "8.0.2"
LONG_VERSION: "8.0.3"
VARIANT: alpine320
PARENT: "alpine"
ISPARENT: "True"
ISLATEST: "False"
PLATFORMS: "linux/amd64,linux/arm64"

8.0.2-scratch320:
8.0.3-scratch320:
extends: .docker
stage: scratch
variables:
MAJOR_VERSION: 8
VERSION: "8.0"
LONG_VERSION: "8.0.2"
LONG_VERSION: "8.0.3"
VARIANT: scratch320
PARENT: "scratch"
ISPARENT: "True"
ISLATEST: "False"
PLATFORMS: "linux/amd64,linux/arm64"

8.0.2-vaapi2404:
8.0.3-vaapi2404:
extends: .docker
stage: vaapi
variables:
MAJOR_VERSION: 8
VERSION: "8.0"
LONG_VERSION: "8.0.2"
LONG_VERSION: "8.0.3"
VARIANT: vaapi2404
PARENT: "vaapi"
ISPARENT: "True"
ISLATEST: "False"
PLATFORMS: "linux/amd64"

8.0.2-nvidia2404:
8.0.3-nvidia2404:
extends: .docker
stage: nvidia
variables:
MAJOR_VERSION: 8
VERSION: "8.0"
LONG_VERSION: "8.0.2"
LONG_VERSION: "8.0.3"
VARIANT: nvidia2404
PARENT: "nvidia"
ISPARENT: "True"
Expand Down