Skip to content

Commit

Permalink
Merge branch 'master' into reftc
Browse files Browse the repository at this point in the history
  • Loading branch information
fbm3307 committed Jul 2, 2024
2 parents cc2ab1e + 3525a39 commit ccc666b
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 1 deletion.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ replace github.com/codeready-toolchain/toolchain-common => github.com/fbm3307/to

require (
github.com/codeready-toolchain/api v0.0.0-20240620205422-a29b6c658d03
github.com/codeready-toolchain/toolchain-common v0.0.0-20240613121043-7e6ef858cdff
github.com/codeready-toolchain/toolchain-common v0.0.0-20240628050807-7f226f55a34a
github.com/go-logr/logr v1.2.3
github.com/google/go-cmp v0.5.9
// using latest commit from 'github.com/openshift/api branch release-4.12'
Expand Down
11 changes: 11 additions & 0 deletions make/go.mk
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,14 @@ generate-assets: go-bindata
@rm ./pkg/consoleplugin/deploy/template_assets.go 2>/dev/null || true
@$(GO_BINDATA) -pkg deploy -o ./pkg/consoleplugin/deploy/template_assets.go -nocompress -prefix deploy/consoleplugin deploy/consoleplugin

.PHONY: verify-dependencies
## Runs commands to verify after the updated dependecies of toolchain-common/API(go mod replace), if the repo needs any changes to be made
verify-dependencies: tidy vet build test lint-go-code

.PHONY: tidy
tidy:
go mod tidy

.PHONY: vet
vet:
go vet ./...

0 comments on commit ccc666b

Please sign in to comment.