From aa73a86acc1cef37cad4adf3fed6dec6647dda21 Mon Sep 17 00:00:00 2001 From: Josh Hudson <382062+itmustbejj@users.noreply.github.com> Date: Thu, 20 Feb 2025 14:05:05 -0800 Subject: [PATCH] Update go version to 1.22 and update a few dep major versions --- .github/workflows/go.yml | 4 ++-- .github/workflows/release.yml | 2 +- githubapps/auth.go | 4 ++-- go.mod | 5 ++--- go.sum | 1 + 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 32303c7..b0860bb 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -9,10 +9,10 @@ jobs: - name: Check out code into the Go module directory uses: actions/checkout@v4 - - name: Set up Go 1.19 + - name: Set up Go 1.22 uses: actions/setup-go@v5 with: - go-version: 1.19 + go-version: 1.22 id: go - name: Get dependencies diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 229951b..955d9bf 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,7 +19,7 @@ jobs: - name: Go Setup uses: actions/setup-go@v5 with: - go-version: 1.19 + go-version: 1.22 - name: GoReleaser Action uses: goreleaser/goreleaser-action@v6 diff --git a/githubapps/auth.go b/githubapps/auth.go index 11d4691..93a552f 100644 --- a/githubapps/auth.go +++ b/githubapps/auth.go @@ -6,7 +6,7 @@ import ( "net/http" "github.com/bradleyfalzon/ghinstallation/v2" - "github.com/google/go-github/v28/github" + "github.com/google/go-github/v68/github" ) // Auther provides API Token with authentication on GitHub Apps. @@ -50,7 +50,7 @@ func (a *auther) FetchToken(ctx context.Context) (string, error) { } if a.store != nil { - err := a.store.Save(t.GetToken(), t.GetExpiresAt()) + err := a.store.Save(t.GetToken(), t.GetExpiresAt().Time) if err != nil { return "", err } diff --git a/go.mod b/go.mod index a878bb3..38a9966 100644 --- a/go.mod +++ b/go.mod @@ -1,15 +1,14 @@ module github.com/mackee/git-credential-github-apps -go 1.19 +go 1.22 require ( github.com/bradleyfalzon/ghinstallation/v2 v2.13.0 - github.com/google/go-github/v28 v28.1.1 + github.com/google/go-github/v68 v68.0.0 ) require ( github.com/golang-jwt/jwt/v4 v4.5.1 // indirect - github.com/google/go-github/v68 v68.0.0 // indirect github.com/google/go-querystring v1.1.0 // indirect golang.org/x/crypto v0.31.0 // indirect ) diff --git a/go.sum b/go.sum index 1542ad8..c6e0165 100644 --- a/go.sum +++ b/go.sum @@ -5,6 +5,7 @@ github.com/golang-jwt/jwt/v4 v4.5.1/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-github/v28 v28.1.1 h1:kORf5ekX5qwXO2mGzXXOjMe/g6ap8ahVe0sBEulhSxo= github.com/google/go-github/v28 v28.1.1/go.mod h1:bsqJWQX05omyWVmc00nEUql9mhQyv38lDZ8kPZcQVoM= github.com/google/go-github/v68 v68.0.0 h1:ZW57zeNZiXTdQ16qrDiZ0k6XucrxZ2CGmoTvcCyQG6s=