Skip to content

Commit

Permalink
build: Vendor gomod2rpmdeps sources
Browse files Browse the repository at this point in the history
This adds gomod2rpmdeps to tools/dummy.go so that it gets
vendored in tools/vendor/.
  • Loading branch information
cfergeau authored and anjannath committed Jul 25, 2022
1 parent 39cfc21 commit 132c5ae
Show file tree
Hide file tree
Showing 7 changed files with 466 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,9 @@ $(TOOLS_BINDIR)/makefat: tools/go.mod
$(TOOLS_BINDIR)/golangci-lint: tools/go.mod
cd tools && GOBIN=$(TOOLS_BINDIR) go install github.com/golangci/golangci-lint/cmd/golangci-lint

$(TOOLS_BINDIR)/gomod2rpmdeps: tools/go.mod
cd tools && GOBIN=$(TOOLS_BINDIR) go install github.com/cfergeau/gomod2rpmdeps/cmd/gomod2rpmdeps

# Run golangci-lint against code
.PHONY: lint cross-lint
lint: $(TOOLS_BINDIR)/golangci-lint
Expand Down Expand Up @@ -342,9 +345,6 @@ $(BUILD_DIR)/macos-universal/crc-macos-installer.tar: packagedir
tar -cvf $@ ./packaging
cd $(@D) && sha256sum $(@F)>$(@F).sha256sum

$(TOOLS_BINDIR)/gomod2rpmdeps:
GOBIN=$(TOOLS_BINDIR) go install -mod=mod github.com/cfergeau/gomod2rpmdeps/cmd/gomod2rpmdeps@latest

%.spec: %.spec.in $(TOOLS_BINDIR)/gomod2rpmdeps
@$(TOOLS_BINDIR)/gomod2rpmdeps | sed -e '/__BUNDLED_PROVIDES__/r /dev/stdin' \
-e '/__BUNDLED_PROVIDES__/d' \
Expand Down
1 change: 1 addition & 0 deletions tools/dummy.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
package buildtools

import (
_ "github.com/cfergeau/gomod2rpmdeps/cmd/gomod2rpmdeps"
_ "github.com/golangci/golangci-lint/cmd/golangci-lint"
_ "github.com/randall77/makefat"
)
1 change: 1 addition & 0 deletions tools/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ module github.com/code-ready/crc/tools
go 1.17

require (
github.com/cfergeau/gomod2rpmdeps v0.0.0-20210223144124-2042c4850ca8
github.com/golangci/golangci-lint v1.47.0
github.com/randall77/makefat v0.0.0-20210315173500-7ddd0e42c844
)
Expand Down
2 changes: 2 additions & 0 deletions tools/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,8 @@ github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghf
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
github.com/cfergeau/gomod2rpmdeps v0.0.0-20210223144124-2042c4850ca8 h1:wueFIqVEP3VJnJTKQ/cU3XB4XuBuuq4XdsbnszU7xEA=
github.com/cfergeau/gomod2rpmdeps v0.0.0-20210223144124-2042c4850ca8/go.mod h1:0vvDpGoZYCjudlASJzqx+hOZjwhE+Q7jdJ8fIhkqsak=
github.com/charithe/durationcheck v0.0.9 h1:mPP4ucLrf/rKZiIG/a9IPXHGlh8p4CzgpyTy6EEutYk=
github.com/charithe/durationcheck v0.0.9/go.mod h1:SSbRIBVfMjCi/kEB6K65XEA83D6prSM8ap1UCpNKtgg=
github.com/chavacava/garif v0.0.0-20220316182200-5cad0b5181d4 h1:tFXjAxje9thrTF4h57Ckik+scJjTWdwAtZqZPtOT48M=
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 132c5ae

Please sign in to comment.