From 86a500309d9dcb2afbe73002a2f874f743625d57 Mon Sep 17 00:00:00 2001 From: Malte Rosenbjerg Date: Wed, 22 Feb 2023 17:49:09 +0100 Subject: [PATCH 1/9] Set ContinuousIntegrationBuild to true --- Directory.Build.props | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Directory.Build.props b/Directory.Build.props index 2944c6b..628195a 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -13,5 +13,14 @@ https://github.com/rosenbjerg/FFMpegCore MIT en + + true + true + snupkg + true + + + true + \ No newline at end of file From cc2d9890f95e2305d94001864af0a304ca81918f Mon Sep 17 00:00:00 2001 From: Malte Rosenbjerg Date: Wed, 22 Feb 2023 17:50:35 +0100 Subject: [PATCH 2/9] CI yaml fixes --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 94a858f..993d057 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,7 +3,7 @@ name: CI on: push: branches: - - master + - main paths: - .github/workflows/ci.yml - FFMpegCore/** @@ -13,9 +13,9 @@ on: - main - release paths: - - .github/workflows/ci.yml - - FFMpegCore/** - - FFMpegCore.Test/** + - .github/workflows/ci.yml + - FFMpegCore/** + - FFMpegCore.Test/** jobs: ci: From 06f5bfa598879d00b1bc92f3732017d358957a47 Mon Sep 17 00:00:00 2001 From: Malte Rosenbjerg Date: Wed, 22 Feb 2023 17:52:29 +0100 Subject: [PATCH 3/9] Update CI paths --- .github/workflows/ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 993d057..6c3ba1e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,6 +8,8 @@ on: - .github/workflows/ci.yml - FFMpegCore/** - FFMpegCore.Test/** + - FFMpegCore.Extensions.SkiaSharp/** + - FFMpegCore.Extensions.System.Drawing.Common/** pull_request: branches: - main @@ -16,6 +18,8 @@ on: - .github/workflows/ci.yml - FFMpegCore/** - FFMpegCore.Test/** + - FFMpegCore.Extensions.SkiaSharp/** + - FFMpegCore.Extensions.System.Drawing.Common/** jobs: ci: From e9264a3c2adeac9304d9541614cfc57ea7f068db Mon Sep 17 00:00:00 2001 From: Malte Rosenbjerg Date: Wed, 22 Feb 2023 17:52:56 +0100 Subject: [PATCH 4/9] Update ci.yml --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6c3ba1e..4f8fa34 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,6 +6,7 @@ on: - main paths: - .github/workflows/ci.yml + - Directory.Build.props - FFMpegCore/** - FFMpegCore.Test/** - FFMpegCore.Extensions.SkiaSharp/** @@ -16,6 +17,7 @@ on: - release paths: - .github/workflows/ci.yml + - Directory.Build.props - FFMpegCore/** - FFMpegCore.Test/** - FFMpegCore.Extensions.SkiaSharp/** From dedd9136822206af8a96ec258cf9f2df7a1188e6 Mon Sep 17 00:00:00 2001 From: Malte Rosenbjerg Date: Wed, 4 Dec 2024 22:15:02 +0200 Subject: [PATCH 5/9] Bump packages --- .../FFMpegCore.Extensions.SkiaSharp.csproj | 4 ++-- .../FFMpegCore.Extensions.System.Drawing.Common.csproj | 2 +- FFMpegCore.Test/FFMpegCore.Test.csproj | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/FFMpegCore.Extensions.SkiaSharp/FFMpegCore.Extensions.SkiaSharp.csproj b/FFMpegCore.Extensions.SkiaSharp/FFMpegCore.Extensions.SkiaSharp.csproj index 3b16e06..0181f64 100644 --- a/FFMpegCore.Extensions.SkiaSharp/FFMpegCore.Extensions.SkiaSharp.csproj +++ b/FFMpegCore.Extensions.SkiaSharp/FFMpegCore.Extensions.SkiaSharp.csproj @@ -13,8 +13,8 @@ - - + + diff --git a/FFMpegCore.Extensions.System.Drawing.Common/FFMpegCore.Extensions.System.Drawing.Common.csproj b/FFMpegCore.Extensions.System.Drawing.Common/FFMpegCore.Extensions.System.Drawing.Common.csproj index ebd7c9a..05bdc73 100644 --- a/FFMpegCore.Extensions.System.Drawing.Common/FFMpegCore.Extensions.System.Drawing.Common.csproj +++ b/FFMpegCore.Extensions.System.Drawing.Common/FFMpegCore.Extensions.System.Drawing.Common.csproj @@ -13,7 +13,7 @@ - + diff --git a/FFMpegCore.Test/FFMpegCore.Test.csproj b/FFMpegCore.Test/FFMpegCore.Test.csproj index 84b863f..7791423 100644 --- a/FFMpegCore.Test/FFMpegCore.Test.csproj +++ b/FFMpegCore.Test/FFMpegCore.Test.csproj @@ -20,7 +20,7 @@ - + From 217c1d99e2dedbef124d91aa955c8bf66d76b8be Mon Sep 17 00:00:00 2001 From: Malte Rosenbjerg Date: Wed, 4 Dec 2024 22:16:22 +0200 Subject: [PATCH 6/9] Bump extension package nuget version --- .../FFMpegCore.Extensions.SkiaSharp.csproj | 2 +- .../FFMpegCore.Extensions.System.Drawing.Common.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/FFMpegCore.Extensions.SkiaSharp/FFMpegCore.Extensions.SkiaSharp.csproj b/FFMpegCore.Extensions.SkiaSharp/FFMpegCore.Extensions.SkiaSharp.csproj index 0181f64..9867a9c 100644 --- a/FFMpegCore.Extensions.SkiaSharp/FFMpegCore.Extensions.SkiaSharp.csproj +++ b/FFMpegCore.Extensions.SkiaSharp/FFMpegCore.Extensions.SkiaSharp.csproj @@ -3,7 +3,7 @@ true Image extension for FFMpegCore using SkiaSharp - 5.0.0 + 5.0.1 ../nupkg diff --git a/FFMpegCore.Extensions.System.Drawing.Common/FFMpegCore.Extensions.System.Drawing.Common.csproj b/FFMpegCore.Extensions.System.Drawing.Common/FFMpegCore.Extensions.System.Drawing.Common.csproj index 05bdc73..885779a 100644 --- a/FFMpegCore.Extensions.System.Drawing.Common/FFMpegCore.Extensions.System.Drawing.Common.csproj +++ b/FFMpegCore.Extensions.System.Drawing.Common/FFMpegCore.Extensions.System.Drawing.Common.csproj @@ -3,7 +3,7 @@ true Image extension for FFMpegCore using System.Common.Drawing - 5.0.0 + 5.0.1 ../nupkg From c7f8c19be762bdc6efcdbeb61782585eaf48908f Mon Sep 17 00:00:00 2001 From: Malte Rosenbjerg Date: Wed, 4 Dec 2024 22:19:57 +0200 Subject: [PATCH 7/9] Specify codecov os --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9a810a2..cc25d22 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -58,3 +58,4 @@ jobs: fail_ci_if_error: true directory: FFMpegCore.Test/TestResults token: ${{ secrets.CODECOV_TOKEN }} + os: windows From 9d0f8893a5ae26a24e41da0b761da6dc1a3eacbf Mon Sep 17 00:00:00 2001 From: Malte Rosenbjerg Date: Wed, 4 Dec 2024 22:25:36 +0200 Subject: [PATCH 8/9] Use codecov/codecov-action@v4 instead of 5 --- .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 cc25d22..3f3677b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -53,7 +53,7 @@ jobs: - if: matrix.os == 'windows-latest' name: Upload coverage reports to Codecov - uses: codecov/codecov-action@v5 + uses: codecov/codecov-action@v4 with: fail_ci_if_error: true directory: FFMpegCore.Test/TestResults From 855e6ece3038d49a70c8003d35f502145eebf0cf Mon Sep 17 00:00:00 2001 From: Malte Rosenbjerg Date: Thu, 5 Dec 2024 10:59:59 +0200 Subject: [PATCH 9/9] Bump Instances --- FFMpegCore/FFMpegCore.csproj | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/FFMpegCore/FFMpegCore.csproj b/FFMpegCore/FFMpegCore.csproj index 2563fb5..5eebc22 100644 --- a/FFMpegCore/FFMpegCore.csproj +++ b/FFMpegCore/FFMpegCore.csproj @@ -17,10 +17,8 @@ - + - -