Stop using git.sr.ht/~spc/go-log and use copy on github.com

.github/workflows/release.yml

@@ -23,7 +23,7 @@ jobs:
         with:
           submodules: true
       - name: Generate build files
-        uses: adamruzicka/go-cross-build@1.19-alpine3.18
+        uses: adamruzicka/go-cross-build@1.23-alpine3.21
         with:
             platforms: 'linux/amd64'
             package: 'src'

.github/workflows/test.yml

@@ -11,8 +11,7 @@ jobs:
     strategy:
       matrix:
         go:
-          - '1.19'
-          - '1.20'
+          - '1.23'
     steps:
       - uses: actions/checkout@v3
         with:
@@ -50,6 +49,6 @@ jobs:
       - name: Setup go
         uses: actions/setup-go@v4
         with:
-          go-version: '1.19'
+          go-version: '1.23'
       - name: Run golangci-lint
         uses: golangci/golangci-lint-action@v3

.packit.yaml

@@ -26,7 +26,6 @@ jobs:
     targets:
       - rhel-9
       - rhel-8
-      - epel-7
 
 srpm_build_deps:
   - golang

go.mod

@@ -1,21 +1,21 @@
 module github.com/theforeman/ygg_worker
 
-go 1.19
+go 1.23
 
 require (
-	git.sr.ht/~spc/go-log v0.1.1
 	github.com/google/uuid v1.6.0
-	github.com/redhatinsights/yggdrasil v0.4.2
+	github.com/redhatinsights/yggdrasil v0.4.6-0.20250429103803-477928891fab
 	github.com/redhatinsights/yggdrasil_v0 v0.0.0-20210811162724-41397343c25b
+	github.com/subpop/go-log v0.1.2
 	google.golang.org/grpc v1.58.3
 )
 
 require (
 	github.com/godbus/dbus/v5 v5.1.0 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
-	golang.org/x/net v0.23.0 // indirect
-	golang.org/x/sys v0.22.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/net v0.33.0 // indirect
+	golang.org/x/sys v0.28.0 // indirect
+	golang.org/x/text v0.21.0 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
 	google.golang.org/protobuf v1.31.0 // indirect
 )

go.sum

@@ -1,22 +1,23 @@
-git.sr.ht/~spc/go-log v0.1.1 h1:pdfV6Q1pNcGVT77DAWzc6LxJyi83PRu1ioZo98ZobAU=
-git.sr.ht/~spc/go-log v0.1.1/go.mod h1:Albq15b/jXGrQ659oyB8X1wX8quqpU+LxXFw7YmEuTg=
 github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=
 github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
 github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/redhatinsights/yggdrasil v0.4.2 h1:onXUovgkFn0bJr5aVPVcP7Xv6NcCLO7EbmvWxya5+yQ=
-github.com/redhatinsights/yggdrasil v0.4.2/go.mod h1:zQKq1GVJq0Kn05pKN7CQmYbhUtqGe4WSduBUdTKlXqs=
-golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
-golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
-golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
-golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
-golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+github.com/redhatinsights/yggdrasil v0.4.6-0.20250429103803-477928891fab h1:k3ORv0D1ifv0BnLp3586ZGHsGNK99cYGleVvScDPITU=
+github.com/redhatinsights/yggdrasil v0.4.6-0.20250429103803-477928891fab/go.mod h1:AHlKNFRWGjL5j3CNoh/wwHI8t0lYBB49fkEvfLDMBSc=
+github.com/subpop/go-log v0.1.2 h1:NgbZR6frmeDtC+96d+UxOkt4X/JxO626fokwL56Dff0=
+github.com/subpop/go-log v0.1.2/go.mod h1:uAEovif98swmWm/8qYGrzGFahUIRQ/KwlBUpJuoOdds=
+golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
+golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
+golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
+golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
+golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 h1:bVf09lpb+OJbByTj913DRJioFFAjf/ZGxEz7MajTp2U=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM=

src/main.go

@@ -8,7 +8,7 @@ import (
 	"syscall"
 	"time"
 
-	"git.sr.ht/~spc/go-log"
+	"github.com/subpop/go-log"
 
 	"github.com/redhatinsights/yggdrasil/worker"
 	pb "github.com/redhatinsights/yggdrasil_v0/protocol"

src/runner.go

@@ -11,8 +11,8 @@ import (
 	"sync"
 	"syscall"
 
-	"git.sr.ht/~spc/go-log"
 	"github.com/google/uuid"
+	"github.com/subpop/go-log"
 )
 
 const preStartErrorExitCode = 254

src/runner_test.go

@@ -7,7 +7,7 @@ import (
 	"syscall"
 	"testing"
 
-	"git.sr.ht/~spc/go-log"
+	"github.com/subpop/go-log"
 )
 
 func TestDispatch(t *testing.T) {

src/update_aggregator.go

@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"time"
 
-	"git.sr.ht/~spc/go-log"
 	"github.com/google/uuid"
+	"github.com/subpop/go-log"
 )
 
 const CountThreshold = 32