From 141c52dd5881047b7508da7b62d47b9e35d9bba7 Mon Sep 17 00:00:00 2001 From: Toastie <toastie@toastiet0ast.com> Date: Thu, 27 Mar 2025 20:12:45 +1300 Subject: [PATCH] I have no idea why this keeps on breaking and I am fast getting to the point of removing the fedora package until I can wrap my head around it. --- Jenkinsfile | 4 ++-- packaging/supportchild.spec | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index d47a07d..d1c9f28 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -74,8 +74,8 @@ pipeline steps { sh 'rpmbuild -bb packaging/supportchild.spec --define "_topdir $PWD/.rpmbuild-fedora" --define "dev_build true"' - sh 'cp .rpmbuild-fedora/RPMS/x86_64/supportchild-dev-*.fedora.x86_64.rpm linux-x64/' - archiveArtifacts(artifacts: 'linux-x64/supportchild-dev-*.fedora.x86_64.rpm', caseSensitive: true) + sh 'cp .rpmbuild-fedora/RPMS/x86_64/supportchild-dev-*.fed.x86_64.rpm linux-x64/' + archiveArtifacts(artifacts: 'linux-x64/supportchild-dev-*.fed.x86_64.rpm', caseSensitive: true) } } } diff --git a/packaging/supportchild.spec b/packaging/supportchild.spec index d2c690b..21a5591 100644 --- a/packaging/supportchild.spec +++ b/packaging/supportchild.spec @@ -7,6 +7,7 @@ Name: supportchild-dev Summary: A support ticket Discord bot (dev build) Version: %{base_version}~%(date "+%%Y%%m%%d%%H%%M%%S")git%(git rev-parse --short HEAD) Source: https://toastielab.dev/toastie-stuff/SupportChild/archive/%(git rev-parse HEAD).zip +Provides: supportchild %else Name: supportchild Summary: A support ticket Discord bot @@ -16,7 +17,7 @@ Source: https://toastielab.dev/toastie-stuff/SupportChild/archive/%{base_ver Release: 1%{?dist} License: GPLv3 URL: https://toastielab.dev/toastie-stuff/SupportChild -Packager: KarlofDuty +Packager: Toastie_t0ast BuildRequires: systemd-rpm-macros Requires: dotnet-runtime-9.0