Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use latest FFmpeg version available #318

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open
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
5 changes: 2 additions & 3 deletions .github/workflows/unit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,9 @@ jobs:
uses: actions/checkout@v4

- name: Setup FFmpeg
uses: FedericoCarboni/setup-ffmpeg@v3
uses: AnimMouse/setup-ffmpeg@v1
with:
# bump: ffmpeg-ci /ffmpeg-version: '([\d.]+)'/ docker:mwader/static-ffmpeg|~7.0
ffmpeg-version: '7.0.2'
version: master
rob93c marked this conversation as resolved.
Show resolved Hide resolved

- name: Setup Java
uses: actions/setup-java@v4
Expand Down
1 change: 0 additions & 1 deletion Bumpfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
.github/workflows/unit-test.yml
Dockerfile
qodana.yaml
3 changes: 1 addition & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ RUN ./gradlew runtime --no-daemon

FROM gcr.io/distroless/base-nossl:nonroot AS bot

# bump: ffmpeg /static-ffmpeg:([\d.]+)/ docker:mwader/static-ffmpeg|~7.0
COPY --from=mwader/static-ffmpeg:7.0.2 /ffmpeg /usr/local/bin/
COPY --from=mwader/static-ffmpeg:latest /ffmpeg /usr/local/bin/
rob93c marked this conversation as resolved.
Show resolved Hide resolved
ENV FFMPEG_PATH=/usr/local/bin/ffmpeg

COPY --from=builder /app/build/jre ./jre
Expand Down
Loading