diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5193d2a..0da1b83 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 diff --git a/FFMpegCore/FFMpeg/Arguments/IDynamicArgument.cs b/FFMpegCore/FFMpeg/Arguments/IDynamicArgument.cs index d44d18d..c7b6b56 100644 --- a/FFMpegCore/FFMpeg/Arguments/IDynamicArgument.cs +++ b/FFMpegCore/FFMpeg/Arguments/IDynamicArgument.cs @@ -8,6 +8,6 @@ /// /// //public string GetText(StringBuilder context); - public string GetText(IEnumerable context); + string GetText(IEnumerable context); } } diff --git a/FFMpegCore/FFMpeg/Arguments/VideoFiltersArgument.cs b/FFMpegCore/FFMpeg/Arguments/VideoFiltersArgument.cs index f7a9e4a..4a43c9d 100644 --- a/FFMpegCore/FFMpeg/Arguments/VideoFiltersArgument.cs +++ b/FFMpegCore/FFMpeg/Arguments/VideoFiltersArgument.cs @@ -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