Skip to content

Commit 132c5ae

Browse files
cfergeauanjannath
authored andcommitted
build: Vendor gomod2rpmdeps sources
This adds gomod2rpmdeps to tools/dummy.go so that it gets vendored in tools/vendor/.
1 parent 39cfc21 commit 132c5ae

File tree

7 files changed

+466
-3
lines changed

7 files changed

+466
-3
lines changed

Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,9 @@ $(TOOLS_BINDIR)/makefat: tools/go.mod
243243
$(TOOLS_BINDIR)/golangci-lint: tools/go.mod
244244
cd tools && GOBIN=$(TOOLS_BINDIR) go install github.com/golangci/golangci-lint/cmd/golangci-lint
245245

246+
$(TOOLS_BINDIR)/gomod2rpmdeps: tools/go.mod
247+
cd tools && GOBIN=$(TOOLS_BINDIR) go install github.com/cfergeau/gomod2rpmdeps/cmd/gomod2rpmdeps
248+
246249
# Run golangci-lint against code
247250
.PHONY: lint cross-lint
248251
lint: $(TOOLS_BINDIR)/golangci-lint
@@ -342,9 +345,6 @@ $(BUILD_DIR)/macos-universal/crc-macos-installer.tar: packagedir
342345
tar -cvf $@ ./packaging
343346
cd $(@D) && sha256sum $(@F)>$(@F).sha256sum
344347

345-
$(TOOLS_BINDIR)/gomod2rpmdeps:
346-
GOBIN=$(TOOLS_BINDIR) go install -mod=mod github.com/cfergeau/gomod2rpmdeps/cmd/gomod2rpmdeps@latest
347-
348348
%.spec: %.spec.in $(TOOLS_BINDIR)/gomod2rpmdeps
349349
@$(TOOLS_BINDIR)/gomod2rpmdeps | sed -e '/__BUNDLED_PROVIDES__/r /dev/stdin' \
350350
-e '/__BUNDLED_PROVIDES__/d' \

tools/dummy.go

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
package buildtools
55

66
import (
7+
_ "github.com/cfergeau/gomod2rpmdeps/cmd/gomod2rpmdeps"
78
_ "github.com/golangci/golangci-lint/cmd/golangci-lint"
89
_ "github.com/randall77/makefat"
910
)

tools/go.mod

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ module github.com/code-ready/crc/tools
33
go 1.17
44

55
require (
6+
github.com/cfergeau/gomod2rpmdeps v0.0.0-20210223144124-2042c4850ca8
67
github.com/golangci/golangci-lint v1.47.0
78
github.com/randall77/makefat v0.0.0-20210315173500-7ddd0e42c844
89
)

tools/go.sum

+2
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,8 @@ github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghf
136136
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
137137
github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
138138
github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
139+
github.com/cfergeau/gomod2rpmdeps v0.0.0-20210223144124-2042c4850ca8 h1:wueFIqVEP3VJnJTKQ/cU3XB4XuBuuq4XdsbnszU7xEA=
140+
github.com/cfergeau/gomod2rpmdeps v0.0.0-20210223144124-2042c4850ca8/go.mod h1:0vvDpGoZYCjudlASJzqx+hOZjwhE+Q7jdJ8fIhkqsak=
139141
github.com/charithe/durationcheck v0.0.9 h1:mPP4ucLrf/rKZiIG/a9IPXHGlh8p4CzgpyTy6EEutYk=
140142
github.com/charithe/durationcheck v0.0.9/go.mod h1:SSbRIBVfMjCi/kEB6K65XEA83D6prSM8ap1UCpNKtgg=
141143
github.com/chavacava/garif v0.0.0-20220316182200-5cad0b5181d4 h1:tFXjAxje9thrTF4h57Ckik+scJjTWdwAtZqZPtOT48M=

tools/vendor/github.com/cfergeau/gomod2rpmdeps/LICENSE

+191
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)