mirror of
https://github.com/rosenbjerg/FFMpegCore.git
synced 2025-12-14 01:55:45 +00:00
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:
commit
37b4119e13
3 changed files with 10 additions and 9 deletions
13
.github/workflows/ci.yml
vendored
13
.github/workflows/ci.yml
vendored
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue