diff --git a/testing/recyclarr-cli/0001-disable-gitversion.patch b/testing/recyclarr-cli/0001-disable-gitversion.patch index 851b6169df2..396ab6575ac 100644 --- a/testing/recyclarr-cli/0001-disable-gitversion.patch +++ b/testing/recyclarr-cli/0001-disable-gitversion.patch @@ -3,30 +3,32 @@ Date: Mon, 7 Aug 2023 09:29:47 +0100 Subject: [PATCH] Disable GitVersion GitVersion is a dependency that needs git history to return the current version. -APKBUILD does not provide git history. Disable it and replace version in prepare() step. +APKBUILD does not use git history. Disable it and just replace version in prepare() step. --- - src/Recyclarr.Cli/Program.cs | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - +diff --git a/src/Recyclarr.Cli/Console/Setup/ProgramInformationDisplayTask.cs b/src/Recyclarr.Cli/Console/Setup/ProgramInformationDisplayTask.cs +index 718c9afa..9780723b 100644 +--- a/src/Recyclarr.Cli/Console/Setup/ProgramInformationDisplayTask.cs ++++ b/src/Recyclarr.Cli/Console/Setup/ProgramInformationDisplayTask.cs +@@ -6,7 +6,7 @@ public class ProgramInformationDisplayTask(ILogger log, IAppPaths paths) : IGlob + { + public void OnStart() + { +- log.Debug("Recyclarr Version: {Version}", GitVersionInformation.InformationalVersion); ++ log.Debug("Recyclarr Version: {Version}"); + log.Debug("App Data Dir: {AppData}", paths.AppDataDirectory); + } + } diff --git a/src/Recyclarr.Cli/Program.cs b/src/Recyclarr.Cli/Program.cs -index 6befa96..d98d643 100644 +index da4a72c1..d9e133ef 100644 --- a/src/Recyclarr.Cli/Program.cs +++ b/src/Recyclarr.Cli/Program.cs -@@ -38,6 +38,7 @@ internal static class Program - config.Settings.StrictParsing = true; +@@ -25,7 +25,7 @@ internal static class Program config.SetApplicationName("recyclarr"); -+ config.SetApplicationVersion("{Version}"); + config.SetApplicationVersion( +- $"v{GitVersionInformation.SemVer} ({GitVersionInformation.FullBuildMetaData})"); ++ "v{Version}"); - var interceptor = new CliInterceptor(logLevelSwitch, appDataPathProvider); - interceptor.OnIntercepted.Subscribe(_ => OnAppInitialized()); -@@ -78,7 +79,7 @@ internal static class Program - } - - _log = _scope.Resolve(); -- _log.Debug("Recyclarr Version: {Version}", GitVersionInformation.InformationalVersion); -+ _log.Debug("Recyclarr Version: {Version}"); - - _tasks = _scope.Resolve>().ToArray(); - _tasks.ForEach(x => x.OnStart()); + config.SetExceptionHandler((ex, resolver) => + { diff --git a/testing/recyclarr-cli/0002-build-dotnet8.patch b/testing/recyclarr-cli/0002-build-dotnet8.patch deleted file mode 100644 index f71e1afa5c7..00000000000 --- a/testing/recyclarr-cli/0002-build-dotnet8.patch +++ /dev/null @@ -1,23 +0,0 @@ -From c1b2ed4021d22eb6245e25bdd2647ef768a34507 Mon Sep 17 00:00:00 2001 -From: Fabricio Silva -Date: Wed, 14 Feb 2024 12:06:58 +0000 -Subject: [PATCH] build with dotnet8.0 - -Build for dotnet8 is not merged to a stable release. For the next release we can probably remove this patch. - ---- - src/Directory.Build.props | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Directory.Build.props b/src/Directory.Build.props -index 8d10c9f9..333301e5 100644 ---- a/src/Directory.Build.props -+++ b/src/Directory.Build.props -@@ -1,6 +1,6 @@ - - -- net7.0 -+ net8.0 - enable - 9999 - enable diff --git a/testing/recyclarr-cli/APKBUILD b/testing/recyclarr-cli/APKBUILD index 497a4dae34f..fcf8037acbf 100644 --- a/testing/recyclarr-cli/APKBUILD +++ b/testing/recyclarr-cli/APKBUILD @@ -1,49 +1,41 @@ # Contributor: Fabricio Silva # Maintainer: Fabricio Silva pkgname=recyclarr-cli -pkgver=6.0.2 -pkgrel=1 +pkgver=7.2.0 +pkgrel=0 pkgdesc="Automatically sync TRaSH guides to your Sonarr and Radarr instances" url="https://github.com/recyclarr/recyclarr" arch="x86_64 aarch64 armv7" license="MIT" options="net !check !strip" # strip breaks the package -depends=" - dotnet8-runtime - git - " +depends="dotnet8-runtime git" makedepends="dotnet8-sdk" source=" $pkgname-$pkgver.tar.gz::https://github.com/recyclarr/recyclarr/archive/refs/tags/v$pkgver.tar.gz 0001-disable-gitversion.patch - 0002-build-dotnet8.patch " builddir="$srcdir/recyclarr-$pkgver" -# map arch to dotnet -case $CARCH in - x86_64) _dotnet_arch="x64" ;; - aarch64) _dotnet_arch="arm64" ;; - armv7) _dotnet_arch="arm" ;; - *) _dotnet_arch="$CARCH" ;; -esac - prepare() { default_prepare # apply patch version - sed -i "s/{Version}/$pkgver-r$pkgrel.alpine/" src/Recyclarr.Cli/Program.cs + local _ver="$pkgver-r$pkgrel.alpine" + ( + cd src/Recyclarr.Cli + sed -i "s/{Version}/$_ver/" Program.cs + sed -i "s/{Version}/$_ver/" Console/Setup/ProgramInformationDisplayTask.cs + ) } build() { - # build the package and generate artifact dotnet publish src/Recyclarr.Cli \ - -p:RuntimeIdentifier="linux-musl-$_dotnet_arch" \ - -p:Configuration=Release \ - -p:SelfContained=false \ + --no-self-contained \ + --use-current-runtime \ + --configuration Release \ + --output publish \ -p:PublishSingleFile=true \ - -p:DisableGitVersionTask=true \ - --output publish + -p:DisableGitVersionTask=true } package() { @@ -51,7 +43,6 @@ package() { } sha512sums=" -70790aee093a2028d817223340a7ba98fb661a57bedbff6735a0d915108a085a80050996bf699dfaa81c34ed85511100eeaf31d90ecec8d798a619b1c47012d6 recyclarr-cli-6.0.2.tar.gz -68bbe5a566fabc49f3382c76550f1462f318ddcbfbad33300551b651ba36e853ce4fed2a39d9dae8e9de1309b2dd5cb73df6f78b9dff1d2a9983b8c0cddda357 0001-disable-gitversion.patch -40d47902cf83f302ed437049154c74b8df7db37009cab0bfdc8b9a1244e0ad20ce5d868680406a487733f9d4a80587454b215196f8830d69fe9fe0b0664f469e 0002-build-dotnet8.patch +27aded1e7f410ade6e70d03717726bdb888c56f04474d0ef84a6aa9d1301a17f82a80d91aa115a8ca6990ea6f29aef8f937f065c2f770938b409a78afeb18a48 recyclarr-cli-7.2.0.tar.gz +ed44885591a7edd446a673bc5ce79fb41dba9d3ffb56167dd2c1e3c0dc739f004c7af39caa940f7a5eb14191fd1e025b0a0b6892371ddcbe9844a38328c4487c 0001-disable-gitversion.patch "