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

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

View file

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

View file

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

View file

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