Skip to content

Commit 023c8d3

Browse files
committed
fix: Update dependencies
1 parent 1abf001 commit 023c8d3

File tree

14 files changed

+137
-100
lines changed

14 files changed

+137
-100
lines changed

.github/workflows/main.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
ref: ${{ github.ref }}
1414
- uses: actions/setup-go@v2
1515
with:
16-
go-version: '^1.21.1'
16+
go-version: '^1.22.1'
1717
- run: go test ./...
1818
release:
1919
name: Release

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.21-alpine as build
1+
FROM golang:1.22-alpine as build
22

33
WORKDIR /src
44

@@ -8,7 +8,7 @@ RUN go test -v -vet=off ./...
88

99
RUN GOOS=linux GARCH=amd64 CGO_ENABLED=0 go build -o git-semver -ldflags="-s -w" cli/main.go
1010

11-
FROM alpine:3.18
11+
FROM alpine:3.19
1212

1313
RUN apk --no-cache add git git-lfs openssh-client
1414

git_utils/get_versions.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package git_utils
22

33
import (
4+
"github.com/go-git/go-git/v5"
45
"github.com/psanetra/git-semver/semver"
5-
"gopkg.in/src-d/go-git.v4"
66
"io"
77
)
88

git_utils/hash_list_contains_tag.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package git_utils
22

33
import (
4-
"gopkg.in/src-d/go-git.v4/plumbing"
4+
"github.com/go-git/go-git/v5/plumbing"
55
)
66

77
func HashListContains(hashList []plumbing.Hash, hash plumbing.Hash) bool {

git_utils/ref_is_on_current_branch.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package git_utils
22

33
import (
4+
"github.com/go-git/go-git/v5"
5+
"github.com/go-git/go-git/v5/plumbing"
6+
"github.com/go-git/go-git/v5/plumbing/revlist"
47
"github.com/pkg/errors"
5-
"gopkg.in/src-d/go-git.v4"
6-
"gopkg.in/src-d/go-git.v4/plumbing"
7-
"gopkg.in/src-d/go-git.v4/plumbing/revlist"
88
)
99

1010
func AssertRefIsReachable(repo *git.Repository, precedingRef *plumbing.Reference, headRef *plumbing.Reference, message string) error {
@@ -23,7 +23,7 @@ func AssertRefIsReachable(repo *git.Repository, precedingRef *plumbing.Reference
2323
refCommitHash := RefToCommitHash(repo.Storer, precedingRef)
2424

2525
if !HashListContains(toRefList, refCommitHash) {
26-
return errors.Errorf(message + " (tag: %s; commit: %s)", precedingRef.Name().String(), refCommitHash.String())
26+
return errors.Errorf(message+" (tag: %s; commit: %s)", precedingRef.Name().String(), refCommitHash.String())
2727
}
2828

2929
return nil

git_utils/ref_to_commit_hash.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package git_utils
22

33
import (
4+
"github.com/go-git/go-git/v5/plumbing"
5+
"github.com/go-git/go-git/v5/plumbing/object"
6+
"github.com/go-git/go-git/v5/plumbing/storer"
47
"github.com/psanetra/git-semver/logger"
5-
"gopkg.in/src-d/go-git.v4/plumbing"
6-
"gopkg.in/src-d/go-git.v4/plumbing/object"
7-
"gopkg.in/src-d/go-git.v4/plumbing/storer"
88
)
99

1010
func RefToCommitHash(storer storer.EncodedObjectStorer, tagRef *plumbing.Reference) plumbing.Hash {

git_utils/sort_commits_desc.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package git_utils
22

3-
import "gopkg.in/src-d/go-git.v4/plumbing/object"
3+
import "github.com/go-git/go-git/v5/plumbing/object"
44

55
type ByHistoryDesc []*object.Commit
66

go.mod

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,40 @@
11
module github.com/psanetra/git-semver
22

33
require (
4+
github.com/go-git/go-git/v5 v5.11.0
45
github.com/pkg/errors v0.9.1
56
github.com/sirupsen/logrus v1.9.3
6-
github.com/spf13/cobra v1.7.0
7-
github.com/stretchr/testify v1.8.4
8-
gopkg.in/src-d/go-git.v4 v4.13.1
7+
github.com/spf13/cobra v1.8.0
8+
github.com/stretchr/testify v1.9.0
99
)
1010

1111
require (
12+
dario.cat/mergo v1.0.0 // indirect
1213
github.com/Microsoft/go-winio v0.6.1 // indirect
14+
github.com/ProtonMail/go-crypto v1.0.0 // indirect
15+
github.com/cloudflare/circl v1.3.7 // indirect
16+
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
1317
github.com/davecgh/go-spew v1.1.1 // indirect
1418
github.com/emirpasic/gods v1.18.1 // indirect
19+
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
20+
github.com/go-git/go-billy/v5 v5.5.0 // indirect
21+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
1522
github.com/inconshreveable/mousetrap v1.1.0 // indirect
1623
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
1724
github.com/kevinburke/ssh_config v1.2.0 // indirect
18-
github.com/mitchellh/go-homedir v1.1.0 // indirect
25+
github.com/pjbgf/sha1cd v0.3.0 // indirect
1926
github.com/pmezard/go-difflib v1.0.0 // indirect
2027
github.com/sergi/go-diff v1.3.1 // indirect
28+
github.com/skeema/knownhosts v1.2.2 // indirect
2129
github.com/spf13/pflag v1.0.5 // indirect
22-
github.com/src-d/gcfg v1.4.0 // indirect
2330
github.com/xanzy/ssh-agent v0.3.3 // indirect
24-
golang.org/x/crypto v0.13.0 // indirect
25-
golang.org/x/mod v0.12.0 // indirect
26-
golang.org/x/net v0.15.0 // indirect
27-
golang.org/x/sys v0.12.0 // indirect
28-
golang.org/x/tools v0.13.0 // indirect
29-
gopkg.in/src-d/go-billy.v4 v4.3.2 // indirect
31+
golang.org/x/crypto v0.21.0 // indirect
32+
golang.org/x/mod v0.16.0 // indirect
33+
golang.org/x/net v0.22.0 // indirect
34+
golang.org/x/sys v0.18.0 // indirect
35+
golang.org/x/tools v0.19.0 // indirect
3036
gopkg.in/warnings.v0 v0.1.2 // indirect
3137
gopkg.in/yaml.v3 v3.0.1 // indirect
3238
)
3339

34-
go 1.21
40+
go 1.22

0 commit comments

Comments
 (0)