github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-17 06:48:51 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #917 from marcov/gocheck

Browse Source 
make: add ability to skip go version check
This commit is contained in:
Sebastien Boeuf
2018-11-19 17:24:53 +00:00
committed by GitHub
parent 187d0139aa 58c1db54a8
commit aafc2a823d
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.ci/install-yq.sh
View File

@@ -59,7 +59,7 @@ function install_yq() {
yq_version=$(basename "${yq_latest_url}") yq_version=$(basename "${yq_latest_url}")
local yq_url="https://${yq_pkg}/releases/download/${yq_version}/yq_${goos}_${goarch}" local yq_url="https://${yq_pkg}/releases/download/${yq_version}/yq_${goos}_${goarch}"
curl -o "${yq_path}" -L ${yq_url} curl -o "${yq_path}" -LSs ${yq_url}
chmod +x ${yq_path} chmod +x ${yq_path}
if ! command -v "${yq_path}" >/dev/null; then if ! command -v "${yq_path}" >/dev/null; then

5
Makefile
View File

@@ -14,8 +14,11 @@ done)
GOARCH=$(shell go env GOARCH) GOARCH=$(shell go env GOARCH)
HOST_ARCH=$(shell arch) HOST_ARCH=$(shell arch)
SKIP_GO_VERSION_CHECK=
include golang.mk ifeq ($(SKIP_GO_VERSION_CHECK),)
include golang.mk
endif
ifeq ($(ARCH),) ifeq ($(ARCH),)
ARCH = $(GOARCH) ARCH = $(GOARCH)

1
golang.mk
View File

@@ -8,6 +8,7 @@
have_yq=$(shell if [ -x "$(GOPATH)/bin/yq" ]; then echo "true"; else echo ""; fi) have_yq=$(shell if [ -x "$(GOPATH)/bin/yq" ]; then echo "true"; else echo ""; fi)
ifeq (,$(have_yq)) ifeq (,$(have_yq))
$(info INFO: yq was not found, installing it)
install_yq=$(shell .ci/install-yq.sh) install_yq=$(shell .ci/install-yq.sh)
endif endif
ifneq (,$(install_yq)) ifneq (,$(install_yq))