Skip to content

Commit 51b1fe6

Browse files
author
Enrico Martelli
committed
Refactor CI setup to use a dedicated FFmpeg Dockerfile and update dependencies
1 parent 4930e4f commit 51b1fe6

File tree

5 files changed

+8
-5
lines changed

5 files changed

+8
-5
lines changed
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
FROM alpine
2+
COPY --from=mwader/static-ffmpeg:7.0.2 /ff* /
3+
ENTRYPOINT cp /ff* /out

.github/workflows/unit-test.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,10 @@ jobs:
2323
- name: Checkout code changes
2424
uses: actions/checkout@v4
2525

26-
# bump: ffmpeg-ci /static-ffmpeg:([\d.]+)/ docker:mwader/static-ffmpeg|~7.0
2726
- name: Setup FFmpeg
2827
shell: bash
2928
run: |
30-
docker run --rm -v "$PWD:/out" $(echo -e 'FROM alpine\nCOPY --from=mwader/static-ffmpeg:7.0.2 /ff* /\nENTRYPOINT cp /ff* /out' | docker build --experimental -q -)
29+
docker run --rm -v "$PWD:/out" -it $(docker build -q .github/workflows/FFmpeg.dockerfile)
3130
echo "$PWD" >> "$GITHUB_PATH"
3231
3332
- name: Setup Java

Bumpfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1-
.github/workflows/unit-test.yml
1+
ffmpeg /static-ffmpeg:([\d.]+)/ docker:mwader/static-ffmpeg|~7.0
2+
qodana /qodana-jvm:([\d.]+)/ docker:jetbrains/qodana-jvm|/^[\d]{4}\.\d+$/|sort
3+
4+
.github/workflows/FFmpeg.dockerfile
25
Dockerfile
36
qodana.yaml

Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ RUN ./gradlew runtime
2323

2424
FROM alpine AS bot
2525

26-
# bump: ffmpeg /static-ffmpeg:([\d.]+)/ docker:mwader/static-ffmpeg|~7.0
2726
COPY --from=mwader/static-ffmpeg:7.0.2 /ffmpeg /usr/local/bin/
2827
ENV FFMPEG_PATH=/usr/local/bin/ffmpeg
2928

qodana.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,5 @@ profile:
33
name: qodana.recommended
44
include:
55
- name: VulnerableLibrariesGlobal
6-
# bump: qodana /qodana-jvm:([\d.]+)/ docker:jetbrains/qodana-jvm|/^[\d]{4}\.\d+$/|sort
76
linter: jetbrains/qodana-jvm:2025.1
87
projectJDK: zulu-24

0 commit comments

Comments
 (0)