Skip to content

Commit

Permalink
Merge pull request #18 from thesn10/main
Browse files Browse the repository at this point in the history
Add support for shared builds on windows
  • Loading branch information
federicocarboni authored Feb 4, 2024
2 parents 36c6454 + e6aba80 commit 7f44588
Show file tree
Hide file tree
Showing 9 changed files with 44,885 additions and 43,079 deletions.
21 changes: 21 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,24 @@ jobs:
ffmpeg-version: '5.1.1'
- run: ffmpeg -version
- run: ffprobe -version

test-shared:
runs-on: windows-latest
timeout-minutes: 2

steps:
- uses: actions/checkout@v3
- name: Run FedericoCarboni/setup-ffmpeg
uses: ./
with:
ffmpeg-version: '6.1.1'
linking-type: shared
- name: Run FedericoCarboni/setup-ffmpeg
id: setup-ffmpeg
uses: ./
with:
ffmpeg-version: 'release'
linking-type: shared
- run: ffmpeg -version
- run: ffprobe -version
- run: dir ${{ steps.setup-ffmpeg.outputs.ffmpeg-path }}
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ steps:
# Target architecture of the ffmpeg executable to install. Defaults to the
# system architecture. Only x64 and arm64 are supported (arm64 only on Linux).
architecture: ''
# Linking type of the binaries. Use "shared" to download shared binaries and
# "static" for statically linked ones. Shared builds are currently only available
# for windows releases. Defaults to "static"
linking-type: static
# As of version 3 of this action, builds are no longer downloaded from GitHub
# except on Windows: https://github.com/GyanD/codexffmpeg/releases.
github-token: ${{ github.server_url == 'https://github.com' && github.token || '' }}
Expand Down
3 changes: 3 additions & 0 deletions action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ inputs:
default: release
architecture:
description: 'Target architecture for FFmpeg, on Windows and MacOS only x64 is supported; on Linux arm64 may also be used. Defaults to the system architecture.'
linking-type:
description: Linking type of the binaries. Use "shared" to download shared binaries and "static" for statically linked ones. Shared builds are currently only available for windows releases. Defaults to "static"
default: static
github-token:
description: "Used to pull Windows builds from GyanD/codexffmpeg. Since there's a default, this is typically not supplied by the user."
default: ${{ github.server_url == 'https://github.com' && github.token || '' }}
Expand Down
Loading

0 comments on commit 7f44588

Please sign in to comment.