diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8d787ff3..28f627bb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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') }} @@ -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" @@ -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' @@ -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 @@ -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 diff --git a/.github/workflows/jekyll-gh-pages.yml b/.github/workflows/jekyll-gh-pages.yml index 74c61904..a438cffc 100644 --- a/.github/workflows/jekyll-gh-pages.yml +++ b/.github/workflows/jekyll-gh-pages.yml @@ -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 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 0deebd92..ccb04d9f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -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 diff --git a/docker-images/8.0/alpine320/Dockerfile b/docker-images/8.0/alpine320/Dockerfile index 1d805ec3..edeea5dd 100644 --- a/docker-images/8.0/alpine320/Dockerfile +++ b/docker-images/8.0/alpine320/Dockerfile @@ -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" diff --git a/docker-images/8.0/nvidia2404/Dockerfile b/docker-images/8.0/nvidia2404/Dockerfile index 13e8e6fb..21a671bb 100644 --- a/docker-images/8.0/nvidia2404/Dockerfile +++ b/docker-images/8.0/nvidia2404/Dockerfile @@ -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 diff --git a/docker-images/8.0/scratch320/Dockerfile b/docker-images/8.0/scratch320/Dockerfile index d63a9346..948e251b 100644 --- a/docker-images/8.0/scratch320/Dockerfile +++ b/docker-images/8.0/scratch320/Dockerfile @@ -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" diff --git a/docker-images/8.0/ubuntu2404-edge/Dockerfile b/docker-images/8.0/ubuntu2404-edge/Dockerfile index 79a5a1ac..e97c4b07 100644 --- a/docker-images/8.0/ubuntu2404-edge/Dockerfile +++ b/docker-images/8.0/ubuntu2404-edge/Dockerfile @@ -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" diff --git a/docker-images/8.0/ubuntu2404/Dockerfile b/docker-images/8.0/ubuntu2404/Dockerfile index 4315cde4..aa4739f8 100644 --- a/docker-images/8.0/ubuntu2404/Dockerfile +++ b/docker-images/8.0/ubuntu2404/Dockerfile @@ -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 diff --git a/docker-images/8.0/vaapi2404/Dockerfile b/docker-images/8.0/vaapi2404/Dockerfile index 929468d9..807befbd 100644 --- a/docker-images/8.0/vaapi2404/Dockerfile +++ b/docker-images/8.0/vaapi2404/Dockerfile @@ -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 diff --git a/docker-images/8.1/ubuntu2404/Dockerfile b/docker-images/8.1/ubuntu2404/Dockerfile index 9bfe83ca..7d467be0 100644 --- a/docker-images/8.1/ubuntu2404/Dockerfile +++ b/docker-images/8.1/ubuntu2404/Dockerfile @@ -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 diff --git a/docker-images/github-actions-matrix.json b/docker-images/github-actions-matrix.json index a90427e5..2624d909 100644 --- a/docker-images/github-actions-matrix.json +++ b/docker-images/github-actions-matrix.json @@ -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", @@ -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", @@ -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", @@ -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", @@ -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", @@ -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", @@ -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", @@ -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", @@ -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", @@ -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", @@ -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", @@ -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", @@ -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", @@ -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", @@ -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", @@ -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", diff --git a/docker-images/gitlab-ci.yml b/docker-images/gitlab-ci.yml index 697e92e8..f549b877 100644 --- a/docker-images/gitlab-ci.yml +++ b/docker-images/gitlab-ci.yml @@ -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"