diff --git a/go.mod b/go.mod index 66f7881e4e5..0ce1626bf1b 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,7 @@ require ( github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-multierror v1.1.1 github.com/hashicorp/golang-lru v1.0.2 - github.com/jenkins-x/go-scm v1.14.34 + github.com/jenkins-x/go-scm v1.14.35 github.com/mitchellh/go-homedir v1.1.0 github.com/opencontainers/image-spec v1.1.0 github.com/pkg/errors v0.9.1 diff --git a/go.sum b/go.sum index 3e8138d3010..44500b9e919 100644 --- a/go.sum +++ b/go.sum @@ -1370,8 +1370,8 @@ github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOl github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= github.com/jellydator/ttlcache/v3 v3.2.0 h1:6lqVJ8X3ZaUwvzENqPAobDsXNExfUJd61u++uW8a3LE= github.com/jellydator/ttlcache/v3 v3.2.0/go.mod h1:hi7MGFdMAwZna5n2tuvh63DvFLzVKySzCVW6+0gA2n4= -github.com/jenkins-x/go-scm v1.14.34 h1:317hYX1YhuFXm71R5Le6et2MtTxAEjeq6OZcZtyKB58= -github.com/jenkins-x/go-scm v1.14.34/go.mod h1:xY4ZqijM05jodyXQCyhb+AywJBytXjMLVijkpBHk/aQ= +github.com/jenkins-x/go-scm v1.14.35 h1:Yov9MqNEJz8xUYhbqNDPVE8dlgfx7rpR8W7dTqguczQ= +github.com/jenkins-x/go-scm v1.14.35/go.mod h1:xY4ZqijM05jodyXQCyhb+AywJBytXjMLVijkpBHk/aQ= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.0.0-20160803190731-bd40a432e4c7/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= diff --git a/vendor/github.com/jenkins-x/go-scm/scm/pr.go b/vendor/github.com/jenkins-x/go-scm/scm/pr.go index 45bed6d85aa..df118450595 100644 --- a/vendor/github.com/jenkins-x/go-scm/scm/pr.go +++ b/vendor/github.com/jenkins-x/go-scm/scm/pr.go @@ -215,7 +215,7 @@ func ToMergeableState(text string) MergeableState { switch strings.ToLower(text) { case "clean", "mergeable", "can_be_merged": return MergeableStateMergeable - case "conflict", "conflicting", "cannot_be_merged": + case "dirty", "conflict", "conflicting", "cannot_be_merged": return MergeableStateConflicting default: return MergeableStateUnknown diff --git a/vendor/modules.txt b/vendor/modules.txt index ce2a3e019d2..c0766d0458c 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -721,7 +721,7 @@ github.com/jbenet/go-context/io # github.com/jellydator/ttlcache/v3 v3.2.0 ## explicit; go 1.18 github.com/jellydator/ttlcache/v3 -# github.com/jenkins-x/go-scm v1.14.34 +# github.com/jenkins-x/go-scm v1.14.35 ## explicit; go 1.19 github.com/jenkins-x/go-scm/pkg/hmac github.com/jenkins-x/go-scm/scm