Alex/FFMpegCore
1
0
Fork 0
mirror of https://github.com/rosenbjerg/FFMpegCore.git synced 2025-12-14 01:55:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #576 from rosenbjerg/migrate-to-macos-latest-test-runner-instead-of-macos-13

Browse source 
CI: Install ffmpeg using brew if running on arm64 macos
This commit is contained in:
Malte Rosenbjerg 2025-10-16 09:59:48 +02:00 • committed by GitHub
commit 37b4119e13
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
.github/workflows/ci.yml vendored
View file

@ -18,7 +18,7 @@ jobs:
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
strategy: strategy:
matrix: matrix:
os: [windows-latest, ubuntu-latest, macos-13] os: [windows-latest, ubuntu-latest, macos-latest]
timeout-minutes: 7 timeout-minutes: 7
steps: steps:
@ -30,14 +30,15 @@ jobs:
with: with:
dotnet-version: '8.0.x' dotnet-version: '8.0.x'
- name: Lint with dotnet - if: matrix.os == 'ubuntu-latest'
name: Lint with dotnet
run: dotnet format FFMpegCore.sln --severity warn --verify-no-changes run: dotnet format FFMpegCore.sln --severity warn --verify-no-changes
- name: Prepare FFMpeg - name: Setup FFmpeg
uses: FedericoCarboni/setup-ffmpeg@v3 uses: AnimMouse/setup-ffmpeg@ae28d57dabbb148eff63170b6bf7f2b60062cbae # 1.1.0
with: with:
ffmpeg-version: 6.0.1 version: ${{ matrix.os != 'macos-latest' && '7.1' || '711' }}
github-token: ${{ secrets.GITHUB_TOKEN }} token: ${{ github.token }}
- name: Test with dotnet - name: Test with dotnet
run: dotnet test FFMpegCore.sln --collect "XPlat Code Coverage" --logger GitHubActions run: dotnet test FFMpegCore.sln --collect "XPlat Code Coverage" --logger GitHubActions

2
FFMpegCore/FFMpeg/Arguments/IDynamicArgument.cs
View file

@ -8,6 +8,6 @@
/// <param name="context"></param> /// <param name="context"></param>
/// <returns></returns> /// <returns></returns>
//public string GetText(StringBuilder context); //public string GetText(StringBuilder context);
public string GetText(IEnumerable<IArgument> context); string GetText(IEnumerable<IArgument> context);
} }
} }

4
FFMpegCore/FFMpeg/Arguments/VideoFiltersArgument.cs
View file

@ -36,8 +36,8 @@ namespace FFMpegCore.Arguments
public interface IVideoFilterArgument public interface IVideoFilterArgument
{ {
public string Key { get; } string Key { get; }
public string Value { get; } string Value { get; }
} }
public class VideoFilterOptions public class VideoFilterOptions