diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-05-02 13:56:30 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-02 13:56:30 -0400 |
| commit | 698cb730a1a7d36bc36e447969928ccb0a6317df (patch) | |
| tree | d223263d6ab480c11b35ee641ffbe9df14ca561a | |
| parent | c3d871a3f6cc7a94c5e86782ba63e05cd1d2faeb (diff) | |
| parent | e17b56e0cfabe9ae59bdc63e55cf66925b84e933 (diff) | |
| download | podman-698cb730a1a7d36bc36e447969928ccb0a6317df.tar.gz podman-698cb730a1a7d36bc36e447969928ccb0a6317df.tar.bz2 podman-698cb730a1a7d36bc36e447969928ccb0a6317df.zip | |
Merge pull request #14078 from Luap99/CI
CI: emergency fix for broken go get
| -rw-r--r-- | Makefile | 11 |
1 files changed, 5 insertions, 6 deletions
@@ -174,9 +174,8 @@ endif # Necessary for nested-$(MAKE) calls and docs/remote-docs.sh export GOOS GOARCH CGO_ENABLED BINSFX SRCBINDIR -define go-get - env GO111MODULE=off \ - $(GO) get -u ${1} +define go-install + $(GO) install ${1}@latest endef # Need to use CGO for mDNS resolution, but cross builds need CGO disabled @@ -865,7 +864,7 @@ install.tools: .install.goimports .install.gitvalidation .install.md2man .instal .install.goimports: .gopathok if [ ! -x "$(GOBIN)/goimports" ]; then \ - $(call go-get,golang.org/x/tools/cmd/goimports); \ + $(call go-install,golang.org/x/tools/cmd/goimports); \ fi touch .install.goimports @@ -878,7 +877,7 @@ install.tools: .install.goimports .install.gitvalidation .install.md2man .instal .PHONY: .install.gitvalidation .install.gitvalidation: .gopathok if [ ! -x "$(GOBIN)/git-validation" ]; then \ - $(call go-get,github.com/vbatts/git-validation); \ + $(call go-install,github.com/vbatts/git-validation); \ fi .PHONY: .install.golangci-lint @@ -898,7 +897,7 @@ install.tools: .install.goimports .install.gitvalidation .install.md2man .instal .PHONY: .install.md2man .install.md2man: .gopathok if [ ! -x "$(GOMD2MAN)" ]; then \ - $(call go-get,github.com/cpuguy83/go-md2man); \ + $(call go-install,github.com/cpuguy83/go-md2man); \ fi # $BUILD_TAGS variable is used in hack/golangci-lint.sh |