Skip to content

Commit 5dccc48

Browse files
committed
[build] Enable ffmpeg on all targets and bump Windows distribution to use ffmpeg 7.0.
1 parent 02eda95 commit 5dccc48

File tree

2 files changed

+8
-19
lines changed

2 files changed

+8
-19
lines changed

.github/workflows/build-windows.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ jobs:
3030
matrix:
3131
python-version: ["3.9"]
3232

33+
env:
34+
ffmpeg-version: "7.0"
35+
3336
steps:
3437
- uses: actions/checkout@v4
3538

@@ -54,12 +57,12 @@ jobs:
5457
uses: dsaltares/fetch-gh-release-asset@1.1.1
5558
with:
5659
repo: 'GyanD/codexffmpeg'
57-
version: 'tags/6.0'
58-
file: 'ffmpeg-6.0-full_build.7z'
60+
version: 'tags/${{ env.ffmpeg-version }}'
61+
file: 'ffmpeg-${{ env.ffmpeg-version }}-full_build.7z'
5962

6063
- name: Unit Test
6164
run: |
62-
7z e ffmpeg-6.0-full_build.7z ffmpeg.exe -r
65+
7z e ffmpeg-${{ env.ffmpeg-version }}-full_build.7z ffmpeg.exe -r
6366
python -m pytest -vv
6467
6568
- name: Build PySceneDetect
@@ -77,7 +80,7 @@ jobs:
7780
Move-Item -Path dist/windows/README* -Destination dist/scenedetect/
7881
Move-Item -Path dist/windows/LICENSE* -Destination dist/scenedetect/thirdparty/
7982
Move-Item -Path scenedetect/_thirdparty/LICENSE* -Destination dist/scenedetect/thirdparty/
80-
7z e -odist/ffmpeg ffmpeg-6.0-full_build.7z LICENSE -r
83+
7z e -odist/ffmpeg ffmpeg-${{ env.ffmpeg-version }}-full_build.7z LICENSE -r
8184
Move-Item -Path ffmpeg.exe -Destination dist/scenedetect/ffmpeg.exe
8285
Move-Item -Path dist/ffmpeg/LICENSE -Destination dist/scenedetect/thirdparty/LICENSE-FFMPEG
8386

.github/workflows/build.yml

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ jobs:
4040

4141
steps:
4242
- uses: actions/checkout@v4
43+
- uses: FedericoCarboni/setup-ffmpeg@v3
4344

4445
- name: Set up Python ${{ matrix.python-version }}
4546
uses: actions/setup-python@v5
@@ -67,21 +68,6 @@ jobs:
6768
git fetch --depth=1 https://github.com/Breakthrough/PySceneDetect.git refs/heads/resources:refs/remotes/origin/resources
6869
git checkout refs/remotes/origin/resources -- tests/resources/
6970
70-
# TODO: Cache this: https://github.com/actions/cache
71-
# TODO: Install ffmpeg/mkvtoolnix on all runners.
72-
- name: Download FFMPEG
73-
if: ${{ runner.os == 'Windows' }}
74-
uses: dsaltares/fetch-gh-release-asset@1.1.1
75-
with:
76-
repo: 'GyanD/codexffmpeg'
77-
version: 'tags/6.0'
78-
file: 'ffmpeg-6.0-full_build.7z'
79-
80-
- name: Extract FFMPEG
81-
if: ${{ runner.os == 'Windows' }}
82-
run: |
83-
7z e ffmpeg-6.0-full_build.7z ffmpeg.exe -r
84-
8571
- name: Unit Tests
8672
run: |
8773
python -m pytest -vv

0 commit comments

Comments
 (0)