Skip to content

Commit 89a2619

Browse files
authored
Refresh actions (#455)
* Pull logged to limit the risks of rate limit * all the MRs in one !450, !451, !452, !453 , !454
1 parent cc1494e commit 89a2619

3 files changed

Lines changed: 24 additions & 19 deletions

File tree

.github/workflows/build.yml

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ jobs:
3131
lint:
3232
runs-on: ubuntu-latest
3333
steps:
34-
- uses: actions/checkout@v4
35-
- uses: actions/setup-python@v5
34+
- uses: actions/checkout@v6
35+
- uses: actions/setup-python@v6
3636
with:
3737
python-version: "3.14"
3838
- run: pip install pre-commit packaging
39-
- uses: actions/cache@v4
39+
- uses: actions/cache@v5
4040
with:
4141
path: ~/.cache/pre-commit
4242
key: pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}
@@ -48,7 +48,7 @@ jobs:
4848
build: ${{ steps.matrix.outputs.build }}
4949
manifest: ${{ steps.matrix.outputs.manifest }}
5050
steps:
51-
- uses: actions/checkout@v4
51+
- uses: actions/checkout@v6
5252
- id: matrix
5353
run: |
5454
echo "build=$(jq -c '.build' docker-images/github-actions-matrix.json)" >> "$GITHUB_OUTPUT"
@@ -63,15 +63,15 @@ jobs:
6363
matrix:
6464
include: ${{ fromJson(needs.generate-matrix.outputs.build) }}
6565
steps:
66-
- uses: actions/checkout@v4
66+
- uses: actions/checkout@v6
6767
- uses: docker/setup-buildx-action@v4
6868
- uses: docker/login-action@v4
69-
if: github.event_name == 'push'
69+
if: github.event.pull_request.head.repo.full_name == github.repository || github.event_name != 'pull_request'
7070
with:
7171
username: ${{ secrets.DOCKER_LOGIN }}
7272
password: ${{ secrets.DOCKER_PASSWORD }}
7373
- uses: docker/login-action@v4
74-
if: github.event_name == 'push'
74+
if: github.event.pull_request.head.repo.full_name == github.repository || github.event_name != 'pull_request'
7575
with:
7676
registry: ghcr.io
7777
username: ${{ github.actor }}
@@ -174,18 +174,20 @@ jobs:
174174
name: github-pages
175175
url: ${{ steps.deployment.outputs.page_url }}
176176
steps:
177-
- uses: actions/checkout@v4
178-
- name: Sync README to docs
177+
- uses: actions/checkout@v6
178+
- name: Sync README and CONTRIBUTING to docs
179179
run: |
180180
mkdir -p docs
181181
printf -- '---\nlayout: default\ntitle: FFmpeg Docker Images\n---\n\n' > docs/index.md
182182
cat README.md >> docs/index.md
183-
- uses: actions/configure-pages@v5
183+
printf -- '---\nlayout: default\ntitle: Contributing\n---\n\n' > docs/contributing.md
184+
cat CONTRIBUTING.md >> docs/contributing.md
185+
- uses: actions/configure-pages@v6
184186
- uses: actions/jekyll-build-pages@v1
185187
with:
186188
source: ./docs
187189
destination: ./_site
188-
- uses: actions/upload-pages-artifact@v3
190+
- uses: actions/upload-pages-artifact@v5
189191
- name: Deploy to GitHub Pages
190192
id: deployment
191193
uses: actions/deploy-pages@v5

README.md

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
# FFmpeg Docker image
22

3-
[![Docker Stars](https://img.shields.io/docker/stars/jrottenberg/ffmpeg.svg?logo=docker&style=plastic)](https://registry.hub.docker.com/v2/repositories/jrottenberg/ffmpeg/stars/count/)
4-
[![Docker pulls](https://img.shields.io/docker/pulls/jrottenberg/ffmpeg.svg?logo=docker&style=plastic)](https://registry.hub.docker.com/v2/repositories/jrottenberg/ffmpeg/)
5-
[![Docker Automated build](https://img.shields.io/docker/automated/jrottenberg/ffmpeg.svg?logo=docker)](https://hub.docker.com/r/jrottenberg/ffmpeg/tags)
6-
[![Github Container Registry Images](https://img.shields.io/badge/images-automated-blue?logo=github&style=plastic)](https://github.com/jrottenberg/ffmpeg/pkgs/container/ffmpeg)
7-
[![gitlab pipeline status](https://gitlab.com/jrottenberg/ffmpeg/badges/main/pipeline.svg)](https://gitlab.com/jrottenberg/ffmpeg/commits/main)
8-
[![GitHub Actions Build Status](https://github.com/jrottenberg/ffmpeg/actions/workflows/build.yml/badge.svg)](https://github.com/jrottenberg/ffmpeg/actions/workflows/build.yml)
3+
[![Stars](https://img.shields.io/docker/stars/jrottenberg/ffmpeg.svg?logo=docker&style=plastic)](https://registry.hub.docker.com/v2/repositories/jrottenberg/ffmpeg/stars/count/)
4+
[![Pulls](https://img.shields.io/docker/pulls/jrottenberg/ffmpeg.svg?logo=docker&style=plastic)](https://registry.hub.docker.com/v2/repositories/jrottenberg/ffmpeg/)
5+
[![Actions](https://github.com/jrottenberg/ffmpeg/actions/workflows/build.yml/badge.svg)](https://github.com/jrottenberg/ffmpeg/actions/workflows/build.yml)
6+
[![Stars](https://img.shields.io/github/stars/jrottenberg/ffmpeg?logo=github&style=plastic)](https://github.com/jrottenberg/ffmpeg/stargazers)
7+
[![Forks](https://img.shields.io/github/forks/jrottenberg/ffmpeg?logo=github&style=plastic)](https://github.com/jrottenberg/ffmpeg/network/members)
98

109

1110
This project prepares a minimalist Docker image with FFmpeg. It compiles FFmpeg from sources following instructions from the [Compilation Guide](https://trac.ffmpeg.org/wiki/CompilationGuide).
@@ -57,10 +56,10 @@ We used the ffmpeg support libraries from the Ubuntu distribution where possible
5756
This image is just like the above `ubuntu2404` container image, except we build all of the ffmpeg support libraries. This is in the spirit of the original intent of this project `jrottenberg/ffmpeg` alltogether. Building everything that ffmpeg needs, and ffmpeg itself from source. This gives us the most control over all of the details of release. The drawback of this is that its much harder to keep updated. The thought process of having both 'Ubuntu-2404' and 'Ubuntu-2404-edge' is that it makes updating the OS easier over time.
5857

5958
**vaapi2404**
60-
This release is like also `ubuntu2404` but enables: [Video Acceleration API (VAAPI)](https://trac.ffmpeg.org/wiki/HWAccelIntro#VAAPI) when building ffmpeg
59+
Based on `ubuntu2404` with [Video Acceleration API (VAAPI)](https://trac.ffmpeg.org/wiki/HWAccelIntro#VAAPI) enabled.
6160

6261
**nvidia2404**
63-
This release is like also `ubuntu2404` but enables: [NVIDIA's hardware-accelerated encoding and decoding APIs](https://trac.ffmpeg.org/wiki/HWAccelIntro#CUDANVENCNVDEC) enabled
62+
Based on `ubuntu2404` with [NVIDIA's hardware-accelerated encoding and decoding APIs](https://trac.ffmpeg.org/wiki/HWAccelIntro#CUDANVENCNVDEC) enabled.
6463

6564
**alpine320**
6665
[alpine](https://alpinelinux.org/releases/) uses the os vendor libs, but ffmpeg is built from source.

docs/assets/css/style.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33

44
@import "jekyll-theme-minimal";
55

6+
footer a:hover {
7+
font-weight: normal;
8+
}
9+
610
.wrapper {
711
max-width: 1200px;
812
width: 90%;

0 commit comments

Comments
 (0)