mirror of
https://github.com/etcd-io/etcd.git
synced 2024-09-27 06:25:44 +00:00
Merge pull request #16039 from kkkkun/replace_gobin
replace gobin with go install
This commit is contained in:
@@ -305,11 +305,6 @@ function tool_exists {
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# Ensure gobin is available, as it runs majority of the tools
|
|
||||||
if ! command -v "gobin" >/dev/null; then
|
|
||||||
run env GO111MODULE=off go get github.com/myitcv/gobin || exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# tool_get_bin [tool] - returns absolute path to a tool binary (or returns error)
|
# tool_get_bin [tool] - returns absolute path to a tool binary (or returns error)
|
||||||
function tool_get_bin {
|
function tool_get_bin {
|
||||||
local tool="$1"
|
local tool="$1"
|
||||||
|
|||||||
@@ -44,7 +44,6 @@ WORKDIR ${GOPATH}/src/go.etcd.io/etcd
|
|||||||
|
|
||||||
ADD ./scripts/install-marker.sh /tmp/install-marker.sh
|
ADD ./scripts/install-marker.sh /tmp/install-marker.sh
|
||||||
|
|
||||||
RUN GO111MODULE=off go get github.com/myitcv/gobin
|
|
||||||
RUN /tmp/install-marker.sh amd64 \
|
RUN /tmp/install-marker.sh amd64 \
|
||||||
&& rm -f /tmp/install-marker.sh \
|
&& rm -f /tmp/install-marker.sh \
|
||||||
&& curl -s https://codecov.io/bash >/codecov \
|
&& curl -s https://codecov.io/bash >/codecov \
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
cd ./tools/mod || exit 2
|
cd ./tools/mod || exit 2
|
||||||
go list --tags tools -f '{{ join .Imports "\n" }}' | xargs gobin -p
|
go list --tags tools -f '{{ join .Imports "\n" }}' | xargs go install
|
||||||
|
|||||||
Reference in New Issue
Block a user