Skip to content

Commit 5d3b31f

Browse files
committed
download kcp via Makefile, do not mark tools as PHONY
On-behalf-of: @SAP [email protected]
1 parent 1c3496e commit 5d3b31f

File tree

2 files changed

+41
-19
lines changed

2 files changed

+41
-19
lines changed

Makefile

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,23 @@ $(YQ):
9191
${YQ_VERSION} \
9292
yq_*
9393

94+
KCP = _tools/kcp
95+
KCP_VERSION = 0.26.1
96+
97+
.PHONY: $(KCP)
98+
$(KCP):
99+
@hack/download-tool.sh \
100+
https://github.com/kcp-dev/kcp/releases/download/v${KCP_VERSION}/kcp_${KCP_VERSION}_${GOOS}_${GOARCH}.tar.gz \
101+
kcp \
102+
${KCP_VERSION}
103+
104+
ENVTEST = _tools/setup-envtest
105+
ENVTEST_VERSION = release-0.19
106+
107+
.PHONY: $(ENVTEST)
108+
$(ENVTEST):
109+
@GO_MODULE=true hack/download-tool.sh sigs.k8s.io/controller-runtime/tools/setup-envtest setup-envtest $(ENVTEST_VERSION)
110+
94111
.PHONY: test
95112
test:
96113
./hack/run-tests.sh

hack/download-tool.sh

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
set -euo pipefail
1818

1919
cd $(dirname $0)/..
20-
source hack/lib.sh
2120

2221
mkdir -p _tools
2322
cd _tools
@@ -26,6 +25,8 @@ URL="$1"
2625
BINARY="$2"
2726
VERSION="$3"
2827
BINARY_PATTERN="${4:-**/$BINARY}"
28+
GO_MODULE=${GO_MODULE:-false}
29+
UNCOMPRESSED=${UNCOMPRESSED:-false}
2930

3031
# Check if and what version we installed already.
3132
versionFile="$BINARY.version"
@@ -45,27 +46,31 @@ fi
4546
cd tmp
4647

4748
echo "Downloading $BINARY version $VERSION" >&2
48-
curl --fail --silent -LO "$URL"
49-
archive="$(ls)"
5049

51-
UNCOMPRESSED=${UNCOMPRESSED:-false}
50+
if $GO_MODULE; then
51+
GOBIN=$(realpath .) go install "$URL@$VERSION"
52+
mv * "../$BINARY"
53+
else
54+
curl --fail --silent -LO "$URL"
55+
archive="$(ls)"
5256

53-
if ! $UNCOMPRESSED; then
54-
case "$archive" in
55-
*.tar.gz | *.tgz)
56-
tar xzf "$archive"
57-
;;
58-
*.zip)
59-
unzip "$archive"
60-
;;
61-
*)
62-
echo "Unknown file type: $archive" >&2
63-
exit 1
64-
esac
65-
fi
57+
if ! $UNCOMPRESSED; then
58+
case "$archive" in
59+
*.tar.gz | *.tgz)
60+
tar xzf "$archive"
61+
;;
62+
*.zip)
63+
unzip "$archive"
64+
;;
65+
*)
66+
echo "Unknown file type: $archive" >&2
67+
exit 1
68+
esac
69+
fi
6670

67-
mv $BINARY_PATTERN ../$BINARY
68-
chmod +x ../$BINARY
71+
mv $BINARY_PATTERN ../$BINARY
72+
chmod +x ../$BINARY
73+
fi
6974
)
7075

7176
rm -rf tmp

0 commit comments

Comments
 (0)