From fd566559956be441ab4a913a4acd9d87808d1f1b Mon Sep 17 00:00:00 2001 From: Malte Rosenbjerg Date: Tue, 31 Jan 2023 23:09:48 +0100 Subject: [PATCH 1/4] Update year --- LICENSE | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index 4c0af3a..f389745 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2022 Vlad Jerca +Copyright (c) 2023 Vlad Jerca Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 7ed60ae..990361e 100644 --- a/README.md +++ b/README.md @@ -231,6 +231,6 @@ Older versions of ffmpeg might not support all ffmpeg arguments available throug ### License -Copyright © 2021 +Copyright © 2023 Released under [MIT license](https://github.com/rosenbjerg/FFMpegCore/blob/master/LICENSE) From 1b729280b65508ed839871e9346eecdbddda89fb Mon Sep 17 00:00:00 2001 From: Malte Rosenbjerg Date: Tue, 31 Jan 2023 23:10:09 +0100 Subject: [PATCH 2/4] Always use Path.GetTempPath() on linux and macos --- FFMpegCore/FFMpeg/Pipes/PipeHelpers.cs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/FFMpegCore/FFMpeg/Pipes/PipeHelpers.cs b/FFMpegCore/FFMpeg/Pipes/PipeHelpers.cs index cb237ed..8705335 100644 --- a/FFMpegCore/FFMpeg/Pipes/PipeHelpers.cs +++ b/FFMpegCore/FFMpeg/Pipes/PipeHelpers.cs @@ -12,9 +12,7 @@ public static string GetPipePath(string pipeName) { if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) return $@"\\.\pipe\{pipeName}"; - if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) - return $"unix:{Path.GetTempPath()}/CoreFxPipe_{pipeName}"; - return $"unix:/tmp/CoreFxPipe_{pipeName}"; + return $"unix:{Path.Combine(Path.GetTempPath(), $"CoreFxPipe_{pipeName}")}"; } } } From f89008358c52b50b0aa01c7c282021d68a9d51d6 Mon Sep 17 00:00:00 2001 From: Malte Rosenbjerg Date: Tue, 31 Jan 2023 23:10:18 +0100 Subject: [PATCH 3/4] Use FedericoCarboni/setup-ffmpeg@v2 --- .github/workflows/ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c807872..a0a7a45 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,10 +28,9 @@ jobs: dotnet-version: '7.0.x' - name: Prepare FFMpeg - uses: Iamshankhadeep/setup-ffmpeg@v1.2 + uses: FedericoCarboni/setup-ffmpeg@v2 with: token: ${{ secrets.GITHUB_TOKEN }} - version: "4.4" - name: Test with dotnet run: dotnet test FFMpegCore.sln --logger GitHubActions From 2d686326243cf71622ffc22ca2341c83da5f8f89 Mon Sep 17 00:00:00 2001 From: Malte Rosenbjerg Date: Tue, 31 Jan 2023 23:11:08 +0100 Subject: [PATCH 4/4] Include macos in ci matrix --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a0a7a45..9c6c98f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,8 +15,8 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [windows-latest, ubuntu-latest] - timeout-minutes: 6 + os: [windows-latest, ubuntu-latest, macos-latest] + timeout-minutes: 7 steps: - name: Checkout