From 46b96bc8090d5dbab782330ee30f6a2f56e240b9 Mon Sep 17 00:00:00 2001 From: Malte Rosenbjerg Date: Sat, 28 Jan 2023 11:08:55 +0100 Subject: [PATCH 1/9] Update ci.yml Former-commit-id: 46eddd374845571c512f2dcf5a8569e12eb0716b --- .github/workflows/ci.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5afb8d4..efcacd3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,13 +1,6 @@ name: CI on: - push: - branches: - - master - paths: - - .github/workflows/ci.yml - - FFMpegCore/** - - FFMpegCore.Test/** pull_request: branches: - master @@ -25,13 +18,20 @@ jobs: os: [windows-latest, ubuntu-latest] timeout-minutes: 6 steps: + - name: Checkout uses: actions/checkout@v2 + - name: Prepare .NET uses: actions/setup-dotnet@v1 with: + repo-token: ${{ secrets.GITHUB_TOKEN }} dotnet-version: '6.0.x' + - name: Prepare FFMpeg uses: FedericoCarboni/setup-ffmpeg@v1 + with: + repo-token: ${{ secrets.GITHUB_TOKEN }} + - name: Test with dotnet run: dotnet test --logger GitHubActions From 9e0882fca78217be7014fcb8f0696caa644abf3a Mon Sep 17 00:00:00 2001 From: Malte Rosenbjerg Date: Sat, 28 Jan 2023 11:12:25 +0100 Subject: [PATCH 2/9] Fix argument Former-commit-id: 0ffd550ebd44d976fdcc97936e890ef2c7e4cc98 --- .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 efcacd3..a1d5c8a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,13 +25,12 @@ jobs: - name: Prepare .NET uses: actions/setup-dotnet@v1 with: - repo-token: ${{ secrets.GITHUB_TOKEN }} dotnet-version: '6.0.x' - name: Prepare FFMpeg uses: FedericoCarboni/setup-ffmpeg@v1 with: - repo-token: ${{ secrets.GITHUB_TOKEN }} + token: ${{ secrets.GITHUB_TOKEN }} - name: Test with dotnet run: dotnet test --logger GitHubActions From cfd348125883614d3392956725e9df3bab596ba6 Mon Sep 17 00:00:00 2001 From: Malte Rosenbjerg Date: Sat, 28 Jan 2023 11:25:28 +0100 Subject: [PATCH 3/9] Bump action versions Former-commit-id: fafb01e02be024b987985169b4092d1c0eaa11b4 --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a1d5c8a..665df6c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,15 +20,15 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Prepare .NET - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v3 with: dotnet-version: '6.0.x' - name: Prepare FFMpeg - uses: FedericoCarboni/setup-ffmpeg@v1 + uses: FedericoCarboni/setup-ffmpeg@v2 with: token: ${{ secrets.GITHUB_TOKEN }} From 18f74f0e4c979d596c79d319e42e35bd03b780d7 Mon Sep 17 00:00:00 2001 From: Malte Rosenbjerg Date: Sat, 28 Jan 2023 11:28:07 +0100 Subject: [PATCH 4/9] Ignore Uri_Duration until root cause found Former-commit-id: 0537c87fa29b03b97ee9275726c9b71c85329d70 --- FFMpegCore.Test/FFProbeTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FFMpegCore.Test/FFProbeTests.cs b/FFMpegCore.Test/FFProbeTests.cs index a4d836d..af7f08b 100644 --- a/FFMpegCore.Test/FFProbeTests.cs +++ b/FFMpegCore.Test/FFProbeTests.cs @@ -99,7 +99,7 @@ public void MediaAnalysis_ParseDuration(string duration, int expectedDays, int e Assert.AreEqual(expectedMilliseconds, parsedDuration.Milliseconds); } - [TestMethod] + [TestMethod, Ignore("Consistently fails on GitHub Workflow ubuntu agents")] public async Task Uri_Duration() { var fileAnalysis = await FFProbe.AnalyseAsync(new Uri("https://github.com/rosenbjerg/FFMpegCore/raw/master/FFMpegCore.Test/Resources/input_3sec.webm")); From e397edc8268e70e7ab0d26c6e3637ef73d0a2e5d Mon Sep 17 00:00:00 2001 From: Malte Rosenbjerg Date: Sat, 28 Jan 2023 11:37:34 +0100 Subject: [PATCH 5/9] Use action that can install specific ffmpeg version Former-commit-id: dd958a3450e7addeb9c8e83b88626cb8c49d4f92 --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 665df6c..44c22ed 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,9 +28,10 @@ jobs: dotnet-version: '6.0.x' - name: Prepare FFMpeg - uses: FedericoCarboni/setup-ffmpeg@v2 + uses: Iamshankhadeep/setup-ffmpeg@v1.2 with: token: ${{ secrets.GITHUB_TOKEN }} + version: "4.4" - name: Test with dotnet run: dotnet test --logger GitHubActions From 73605e5f91356ebbbeac6b6f773216affd49180c Mon Sep 17 00:00:00 2001 From: Malte Rosenbjerg Date: Sat, 28 Jan 2023 11:39:44 +0100 Subject: [PATCH 6/9] Remove ignore Former-commit-id: d85a4b81abaf4ab7832020cdb2ccfb46758d3bde --- FFMpegCore.Test/FFProbeTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FFMpegCore.Test/FFProbeTests.cs b/FFMpegCore.Test/FFProbeTests.cs index af7f08b..a4d836d 100644 --- a/FFMpegCore.Test/FFProbeTests.cs +++ b/FFMpegCore.Test/FFProbeTests.cs @@ -99,7 +99,7 @@ public void MediaAnalysis_ParseDuration(string duration, int expectedDays, int e Assert.AreEqual(expectedMilliseconds, parsedDuration.Milliseconds); } - [TestMethod, Ignore("Consistently fails on GitHub Workflow ubuntu agents")] + [TestMethod] public async Task Uri_Duration() { var fileAnalysis = await FFProbe.AnalyseAsync(new Uri("https://github.com/rosenbjerg/FFMpegCore/raw/master/FFMpegCore.Test/Resources/input_3sec.webm")); From c2559148eadf8e4e0952a4a5f37f31d4ec74cb33 Mon Sep 17 00:00:00 2001 From: Malte Rosenbjerg Date: Sat, 28 Jan 2023 11:41:19 +0100 Subject: [PATCH 7/9] Revert "Remove ignore" This reverts commit 73605e5f91356ebbbeac6b6f773216affd49180c [formerly d85a4b81abaf4ab7832020cdb2ccfb46758d3bde]. Former-commit-id: d3d49655f47def3ef8f1dfe47cd92d5549395957 --- FFMpegCore.Test/FFProbeTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FFMpegCore.Test/FFProbeTests.cs b/FFMpegCore.Test/FFProbeTests.cs index a4d836d..af7f08b 100644 --- a/FFMpegCore.Test/FFProbeTests.cs +++ b/FFMpegCore.Test/FFProbeTests.cs @@ -99,7 +99,7 @@ public void MediaAnalysis_ParseDuration(string duration, int expectedDays, int e Assert.AreEqual(expectedMilliseconds, parsedDuration.Milliseconds); } - [TestMethod] + [TestMethod, Ignore("Consistently fails on GitHub Workflow ubuntu agents")] public async Task Uri_Duration() { var fileAnalysis = await FFProbe.AnalyseAsync(new Uri("https://github.com/rosenbjerg/FFMpegCore/raw/master/FFMpegCore.Test/Resources/input_3sec.webm")); From a730cde791fcc827fbea7f4d08709eac5bc0689c Mon Sep 17 00:00:00 2001 From: Malte Rosenbjerg Date: Sat, 28 Jan 2023 13:25:48 +0100 Subject: [PATCH 8/9] Bump dependencies Former-commit-id: b84bb6470a190fa72db8182a84568fbfe3cddd3e --- FFMpegCore.Test/FFMpegCore.Test.csproj | 13 ++++++++----- FFMpegCore/FFMpegCore.csproj | 6 +++--- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/FFMpegCore.Test/FFMpegCore.Test.csproj b/FFMpegCore.Test/FFMpegCore.Test.csproj index d281c3d..4ac890c 100644 --- a/FFMpegCore.Test/FFMpegCore.Test.csproj +++ b/FFMpegCore.Test/FFMpegCore.Test.csproj @@ -39,11 +39,14 @@ - - - - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + diff --git a/FFMpegCore/FFMpegCore.csproj b/FFMpegCore/FFMpegCore.csproj index f40295c..79d191e 100644 --- a/FFMpegCore/FFMpegCore.csproj +++ b/FFMpegCore/FFMpegCore.csproj @@ -37,9 +37,9 @@ - - - + + + From 36589eecef55598a0a09391c77551ab281adb1a3 Mon Sep 17 00:00:00 2001 From: Malte Rosenbjerg Date: Sat, 28 Jan 2023 13:28:37 +0100 Subject: [PATCH 9/9] Use setup-dotnet@v2 since v3 seems to install .NET 7 Former-commit-id: f2abd9ae63e251f10f3053775a3b3e1ee8fba07f --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 44c22ed..c470186 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: uses: actions/checkout@v3 - name: Prepare .NET - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v2 with: dotnet-version: '6.0.x'