Skip to content

Commit a2bd369

Browse files
committed
Merge branch 'develop' into force-abort-fix
2 parents 5b6e9f8 + e70db64 commit a2bd369

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ require gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
288288

289289
replace (
290290
github.com/argoproj/argo-workflows/v3 v3.5.10 => github.com/devtron-labs/argo-workflows/v3 v3.5.10
291-
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241010131105-e2c23f9c80da
291+
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241014135751-87207db6607c
292292
github.com/go-check/check => github.com/go-check/check v0.0.0-20180628173108-788fd7840127
293293
github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.5.5
294294
k8s.io/api => k8s.io/api v0.29.7

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -794,8 +794,8 @@ github.com/devtron-labs/argo-workflows/v3 v3.5.10 h1:6rxQOesOzDz6SgQCMDQNHaehsKF
794794
github.com/devtron-labs/argo-workflows/v3 v3.5.10/go.mod h1:/vqxcovDPT4zqr4DjR5v7CF8ggpY1l3TSa2CIG3jmjA=
795795
github.com/devtron-labs/authenticator v0.4.35-0.20240809073103-6e11da8083f8 h1:2+Q7Jdhpo/uMiaQiZZzAh+ZX7wEJIFuMFG6DEiMuo64=
796796
github.com/devtron-labs/authenticator v0.4.35-0.20240809073103-6e11da8083f8/go.mod h1:702R6WIf5y9UzKGoCGxQ+x3l5Ws+l0fXg2xlCpSGFZI=
797-
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241010131105-e2c23f9c80da h1:vC6SMz6BM1doN+ZBGiDGyERJ/LphFQi5+Ab/YQkNJVo=
798-
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241010131105-e2c23f9c80da/go.mod h1:KpKnF4OSpQNDJmb4wVZq3Za88ePBw4xec2GOAGRm5UQ=
797+
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241014135751-87207db6607c h1:8WIzXcESSOAfkF7SmNLvxNxMnNS9DJtji6qlJr/5XzI=
798+
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241014135751-87207db6607c/go.mod h1:KpKnF4OSpQNDJmb4wVZq3Za88ePBw4xec2GOAGRm5UQ=
799799
github.com/devtron-labs/go-bitbucket v0.9.60-beta h1:VEx1jvDgdtDPS6A1uUFoaEi0l1/oLhbr+90xOwr6sDU=
800800
github.com/devtron-labs/go-bitbucket v0.9.60-beta/go.mod h1:GnuiCesvh8xyHeMCb+twm8lBR/kQzJYSKL28ZfObp1Y=
801801
github.com/devtron-labs/protos v0.0.3-0.20240802105333-92ee9bb85d80 h1:xwbTeijNTf4/j1v+tSfwVqwLVnReas/NqEKeQHvSTys=

pkg/plugin/repository/GlobalPluginRepository.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ type PluginMetadata struct {
141141
PluginVersion string `sql:"plugin_version, notnull"`
142142
IsDeprecated bool `sql:"is_deprecated, notnull"`
143143
DocLink string `sql:"doc_link"`
144-
IsLatest bool `sql:"is_latest"`
144+
IsLatest bool `sql:"is_latest, notnull"`
145145
sql.AuditLog
146146
}
147147

vendor/modules.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ github.com/devtron-labs/authenticator/jwt
344344
github.com/devtron-labs/authenticator/middleware
345345
github.com/devtron-labs/authenticator/oidc
346346
github.com/devtron-labs/authenticator/password
347-
# github.com/devtron-labs/common-lib v0.18.1-0.20241001061923-eda545dc839e => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241007082547-2dffd643a849
347+
# github.com/devtron-labs/common-lib v0.18.1-0.20241001061923-eda545dc839e => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241014135751-87207db6607c
348348
## explicit; go 1.21
349349
github.com/devtron-labs/common-lib/async
350350
github.com/devtron-labs/common-lib/blob-storage
@@ -2212,7 +2212,7 @@ xorm.io/xorm/log
22122212
xorm.io/xorm/names
22132213
xorm.io/xorm/schemas
22142214
xorm.io/xorm/tags
2215-
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241007082547-2dffd643a849
2215+
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241014135751-87207db6607c
22162216
# github.com/go-check/check => github.com/go-check/check v0.0.0-20180628173108-788fd7840127
22172217
# github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.5.5
22182218
# k8s.io/api => k8s.io/api v0.29.7

0 commit comments

Comments
 (0)