Merge pull request #463 from wreulicke/upgrade-go-github

Upgrade go-github (and the dependants) and pass name option

Author: k1LoW

config/ready_test.go

@@ -7,8 +7,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/google/go-github/v58/github"
-	"github.com/k1LoW/go-github-client/v58/factory"
+	"github.com/google/go-github/v67/github"
+	"github.com/k1LoW/go-github-client/v67/factory"
 	"github.com/k1LoW/octocov/gh"
 	"github.com/migueleliasweb/go-github-mock/src/mock"
 )

gh/gh.go

@@ -22,9 +22,9 @@ import (
 	"github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/plumbing/object"
 	ghttp "github.com/go-git/go-git/v5/plumbing/transport/http"
-	"github.com/google/go-github/v58/github"
+	"github.com/google/go-github/v67/github"
 	"github.com/k1LoW/go-github-actions/artifact"
-	"github.com/k1LoW/go-github-client/v58/factory"
+	"github.com/k1LoW/go-github-client/v67/factory"
 	"github.com/k1LoW/repin"
 	"github.com/lestrrat-go/backoff/v2"
 	"github.com/shurcooL/githubv4"
@@ -531,18 +531,18 @@ func (g *Gh) FetchLatestArtifact(ctx context.Context, owner, repo, name, fp stri
 	const maxRedirect = 5
 	page := 1
 	for {
-		l, res, err := g.client.Actions.ListArtifacts(ctx, owner, repo, &github.ListOptions{
-			Page:    page,
-			PerPage: 100,
+		l, res, err := g.client.Actions.ListArtifacts(ctx, owner, repo, &github.ListArtifactsOptions{
+			Name: &name,
+			ListOptions: github.ListOptions{
+				Page:    page,
+				PerPage: 100,
+			},
 		})
 		if err != nil {
 			return nil, err
 		}
 		page += 1
 		for _, a := range l.Artifacts {
-			if a.GetName() != name {
-				continue
-			}
 			u, _, err := g.client.Actions.DownloadArtifact(ctx, owner, repo, a.GetID(), maxRedirect)
 			if err != nil {
 				return nil, err

gh/gh_test.go

@@ -6,8 +6,8 @@ import (
 	"time"
 
 	"github.com/google/go-cmp/cmp"
-	"github.com/google/go-github/v58/github"
-	"github.com/k1LoW/go-github-client/v58/factory"
+	"github.com/google/go-github/v67/github"
+	"github.com/k1LoW/go-github-client/v67/factory"
 	"github.com/migueleliasweb/go-github-mock/src/mock"
 )
 

go.mod

@@ -21,17 +21,17 @@ require (
 	github.com/goccy/go-yaml v1.15.23
 	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0
 	github.com/google/go-cmp v0.7.0
-	github.com/google/go-github/v58 v58.0.0
+	github.com/google/go-github/v67 v67.0.0
 	github.com/h2non/go-is-svg v0.0.0-20160927212452-35e8c4b0612c
 	github.com/hashicorp/go-multierror v1.1.1
 	github.com/hhatto/gocloc v0.5.3
 	github.com/josharian/txtarfs v0.0.0-20210615234325-77aca6df5bca
 	github.com/jszwec/s3fs/v2 v2.0.0
 	github.com/k1LoW/duration v1.2.0
 	github.com/k1LoW/expand v0.15.5
-	github.com/k1LoW/ghfs v1.3.2
+	github.com/k1LoW/ghfs v1.4.0
 	github.com/k1LoW/go-github-actions v0.1.0
-	github.com/k1LoW/go-github-client/v58 v58.0.13
+	github.com/k1LoW/go-github-client/v67 v67.0.13
 	github.com/k1LoW/repin v0.3.4
 	github.com/lestrrat-go/backoff/v2 v2.0.8
 	github.com/lucasb-eyer/go-colorful v1.2.0

go.sum

@@ -1501,12 +1501,12 @@ github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 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/go-github/v58 v58.0.0 h1:Una7GGERlF/37XfkPwpzYJe0Vp4dt2k1kCjlxwjIvzw=
-github.com/google/go-github/v58 v58.0.0/go.mod h1:k4hxDKEfoWpSqFlc8LTpGd9fu2KrV1YAa6Hi6FmDNY4=
 github.com/google/go-github/v64 v64.0.0 h1:4G61sozmY3eiPAjjoOHponXDBONm+utovTKbyUb2Qdg=
 github.com/google/go-github/v64 v64.0.0/go.mod h1:xB3vqMQNdHzilXBiO2I+M7iEFtHf+DP/omBOv6tQzVo=
 github.com/google/go-github/v66 v66.0.0 h1:ADJsaXj9UotwdgK8/iFZtv7MLc8E8WBl62WLd/D/9+M=
 github.com/google/go-github/v66 v66.0.0/go.mod h1:+4SO9Zkuyf8ytMj0csN1NR/5OTR+MfqPp8P8dVlcvY4=
+github.com/google/go-github/v67 v67.0.0 h1:g11NDAmfaBaCO8qYdI9fsmbaRipHNWRIU/2YGvlh4rg=
+github.com/google/go-github/v67 v67.0.0/go.mod h1:zH3K7BxjFndr9QSeFibx4lTKkYS3K9nDanoI1NjaOtY=
 github.com/google/go-pkcs11 v0.2.0/go.mod h1:6eQoGcuNJpa7jnd5pMGdkSaQpNDYvPlXWMcjXXThLlY=
 github.com/google/go-pkcs11 v0.2.1-0.20230907215043-c6f79328ddf9/go.mod h1:6eQoGcuNJpa7jnd5pMGdkSaQpNDYvPlXWMcjXXThLlY=
 github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
@@ -1616,12 +1616,12 @@ github.com/k1LoW/duration v1.2.0 h1:qq1gWtPh7YROFyerBufVP+ATR11mOOHDInrcC/Xe/6A=
 github.com/k1LoW/duration v1.2.0/go.mod h1:qUa0NptIiUl5EUsCc8wIiSaHuNjS4wmpYNMHp0l6pos=
 github.com/k1LoW/expand v0.15.5 h1:N1tVVQFktUSa3ciKHgFAgAW6OUkIomdfKnfBxhSm/24=
 github.com/k1LoW/expand v0.15.5/go.mod h1:zvniCuyN01GE5JHsfKvCQf+XbCKc0oIr/98JnkUKzho=
-github.com/k1LoW/ghfs v1.3.2 h1:0gerdLZ2acRQXLoIlx7Vr9JzSh4mbC9knflmd8T2VTA=
-github.com/k1LoW/ghfs v1.3.2/go.mod h1:OGOLqoOBxqVdqe7gJDAVQbzAs+s/9+y63xQrvgDcIBc=
+github.com/k1LoW/ghfs v1.4.0 h1:P3eHXdJtDUd1YLXDLsGLDln0BFCUWXc3oox567Kw644=
+github.com/k1LoW/ghfs v1.4.0/go.mod h1:tYmUhMn65AFrbHtS8W15BBzVIw9kt7bDKLrPy4zgeWs=
 github.com/k1LoW/go-github-actions v0.1.0 h1:H2wm27ULj/2BSAX5YhqCSKFE69qcuZtBhMHliGKUk/c=
 github.com/k1LoW/go-github-actions v0.1.0/go.mod h1:LFbGxDc0rMV42XFLCtG2H2a4qgGP94H9ikknv+EAYn4=
-github.com/k1LoW/go-github-client/v58 v58.0.13 h1:iTZdV3EQBVSaTyF5dEPEyrULxgienSRDur571yoIgcI=
-github.com/k1LoW/go-github-client/v58 v58.0.13/go.mod h1:KRNfRyjoqVrYPYSVOtNOQBLXQS5tJ+yWNoGDjH5uXZ0=
+github.com/k1LoW/go-github-client/v67 v67.0.13 h1:PjzG1zRpA+kKQEq3Z0fZ/8UMJLHaLGoHptMpOPViptw=
+github.com/k1LoW/go-github-client/v67 v67.0.13/go.mod h1:lc+16Z0jIZ11eqy2IeGKUZ9XPKBxyWXIKVfFMy7MEgU=
 github.com/k1LoW/repin v0.3.4 h1:xcNuBBc/ISHUNBzjXNTCux4OYZND5ZMiyz4SrRtpDhg=
 github.com/k1LoW/repin v0.3.4/go.mod h1:1abQMGdYFegTCsxbhZ3O5P8aKENYS37UhQKwKYKiYkg=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=

pplang/pplang.go

@@ -9,8 +9,8 @@ import (
 	"strings"
 
 	giturls "github.com/chainguard-dev/git-urls"
-	"github.com/google/go-github/v58/github"
-	"github.com/k1LoW/go-github-client/v58/factory"
+	"github.com/google/go-github/v67/github"
+	"github.com/k1LoW/go-github-client/v67/factory"
 	"gopkg.in/ini.v1"
 )
 

pplang/pplang_test.go

@@ -6,9 +6,9 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/google/go-github/v58/github"
+	"github.com/google/go-github/v67/github"
 	"github.com/josharian/txtarfs"
-	"github.com/k1LoW/go-github-client/v58/factory"
+	"github.com/k1LoW/go-github-client/v67/factory"
 	"github.com/migueleliasweb/go-github-mock/src/mock"
 	"golang.org/x/tools/txtar"
 )