Update to version 0.2.2

This commit is contained in:
Link Dupont 2023-10-24 15:10:46 -04:00
parent 299a373a10
commit e48c71842c
5 changed files with 70 additions and 3 deletions

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
/yggdrasil-worker-package-manager-0.2.0.tar.gz /yggdrasil-worker-package-manager-0.2.0.tar.gz
/yggdrasil-worker-package-manager-0.2.0.tar.xz /yggdrasil-worker-package-manager-0.2.0.tar.xz
/yggdrasil-worker-package-manager-0.2.1.tar.xz /yggdrasil-worker-package-manager-0.2.1.tar.xz
/yggdrasil-worker-package-manager-0.2.2.tar.xz

View File

@ -0,0 +1,53 @@
From 8c19d5ac3d5731750c935e1e23e9f4add49bff48 Mon Sep 17 00:00:00 2001
From: Link Dupont <link@sub-pop.net>
Date: Tue, 24 Oct 2023 20:45:45 -0400
Subject: [PATCH] refactor: downgrade yggdrasil version to 0.4.1
'latest' contains additional changes to the worker package that aren't
released in a tagged version yet.
---
go.mod | 2 +-
go.sum | 4 ++--
main.go | 1 -
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/go.mod b/go.mod
index 683d9d2..95a3e2a 100644
--- a/go.mod
+++ b/go.mod
@@ -6,7 +6,7 @@ require (
git.sr.ht/~spc/go-log v0.0.0-20210611184941-ce2f05edb627
github.com/google/uuid v1.3.1
github.com/peterbourgon/ff/v3 v3.1.0
- github.com/redhatinsights/yggdrasil v0.0.0-20231011123719-5130298ed3ac
+ github.com/redhatinsights/yggdrasil v0.0.0-20230918163727-97cd578cc7c6
github.com/sgreben/flagvar v1.10.1
github.com/zcalusic/sysinfo v1.0.2
)
diff --git a/go.sum b/go.sum
index 6420143..5b3b778 100644
--- a/go.sum
+++ b/go.sum
@@ -13,8 +13,8 @@ github.com/pelletier/go-toml v1.9.4 h1:tjENF6MfZAg8e4ZmZTeWaWiT2vXtsoO6+iuOjFhEC
github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
github.com/peterbourgon/ff/v3 v3.1.0 h1:5JAeDK5j/zhKFjyHEZQXwXBoDijERaos10RE+xamOsY=
github.com/peterbourgon/ff/v3 v3.1.0/go.mod h1:XNJLY8EIl6MjMVjBS4F0+G0LYoAqs0DTa4rmHHukKDE=
-github.com/redhatinsights/yggdrasil v0.0.0-20231011123719-5130298ed3ac h1:rqRkjhJWxnNmmxCjxal5PrGuHtp93OCZn1PHPdQMCDQ=
-github.com/redhatinsights/yggdrasil v0.0.0-20231011123719-5130298ed3ac/go.mod h1:Rwya3pQvxCNI/2bjNQ9N6cHTMd2YKrRCJ2sENRawoBg=
+github.com/redhatinsights/yggdrasil v0.0.0-20230918163727-97cd578cc7c6 h1:YLX/bTYS5/BwZt7vw8vIAr3vqM8tioJr3vajhSlCpzg=
+github.com/redhatinsights/yggdrasil v0.0.0-20230918163727-97cd578cc7c6/go.mod h1:Rwya3pQvxCNI/2bjNQ9N6cHTMd2YKrRCJ2sENRawoBg=
github.com/sgreben/flagvar v1.10.1 h1:ukN3zqVj9T9U7CiKG6owmejxswJYMbAg9Mxkhi1B4tw=
github.com/sgreben/flagvar v1.10.1/go.mod h1:AxDmbFDIxZ4dHj2zg8LxuJn5CSwSS28iY/Wy56e+nhI=
github.com/zcalusic/sysinfo v1.0.2 h1:nwTTo2a+WQ0NXwo0BGRojOJvJ/5XKvQih+2RrtWqfxc=
diff --git a/main.go b/main.go
index 719f304..280e7ce 100644
--- a/main.go
+++ b/main.go
@@ -84,7 +84,6 @@ func main() {
"package_manager",
false,
map[string]string{"version": Version},
- nil,
dataRx,
nil,
)

View File

@ -0,0 +1,11 @@
diff -urN yggdrasil-worker-package-manager-0.2.2.orig/main.go yggdrasil-worker-package-manager-0.2.2/main.go
--- yggdrasil-worker-package-manager-0.2.2.orig/main.go 2023-10-24 15:05:50.000000000 -0400
+++ yggdrasil-worker-package-manager-0.2.2/main.go 2023-10-24 15:19:25.103780295 -0400
@@ -84,7 +84,6 @@
"package_manager",
false,
map[string]string{"version": Version},
- nil,
dataRx,
nil,
)

View File

@ -1 +1 @@
SHA512 (yggdrasil-worker-package-manager-0.2.1.tar.xz) = 70785f708be0d00799794dd9066aae07e9e73e77154edbc30a6c1a74dc1bff28eade908f440b9d332e176e5251a61e3505740edd538ec397562d9c86fdb7374c SHA512 (yggdrasil-worker-package-manager-0.2.2.tar.xz) = 91a44e6b99c36bf0791f298d6ea2dfc9aacb4098b1f0b6305ef4084f5774eef55a3e309cff99915e0e28cf3a06dba797c66915975fba08fc0423f18f97cd5990

View File

@ -2,8 +2,8 @@
# https://github.com/redhatinsights/yggdrasil-worker-package-manager # https://github.com/redhatinsights/yggdrasil-worker-package-manager
%global goipath github.com/redhatinsights/yggdrasil-worker-package-manager %global goipath github.com/redhatinsights/yggdrasil-worker-package-manager
Version: 0.2.1 Version: 0.2.2
%global tag 0.2.1 %global tag %{version}
%gometa -f %gometa -f
@ -25,6 +25,8 @@ License: GPL-3.0-only
URL: %{gourl} URL: %{gourl}
Source: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz Source: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz
Patch0: 8c19d5ac3d5731750c935e1e23e9f4add49bff48.patch
BuildRequires: systemd-rpm-macros BuildRequires: systemd-rpm-macros
BuildRequires: meson BuildRequires: meson
BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(dbus-1)