mirror of https://github.com/istio/istio.io.git
Update to latest Hugo. (#5058)
This commit is contained in:
parent
994e8a7464
commit
8b56c8c1c1
5
Makefile
5
Makefile
|
@ -57,10 +57,12 @@ TARGET_OUT ?= $(HOME)/istio_out/$(REPO_NAME)
|
|||
ifeq ($(BUILD_WITH_CONTAINER),1)
|
||||
CONTAINER_CLI ?= docker
|
||||
DOCKER_SOCKET_MOUNT ?= -v /var/run/docker.sock:/var/run/docker.sock
|
||||
IMG ?= gcr.io/istio-testing/build-tools:2019-09-23T12-48-14
|
||||
IMG ?= gcr.io/istio-testing/build-tools:2019-09-25T19-39-04
|
||||
UID = $(shell id -u)
|
||||
PWD = $(shell pwd)
|
||||
|
||||
$(info Building with the build container: $(IMG).)
|
||||
|
||||
# Determine the timezone across various platforms to pass into the
|
||||
# docker run operation. This operation assumes zoneinfo is within
|
||||
# the path of the file.
|
||||
|
@ -79,6 +81,7 @@ RUN = $(CONTAINER_CLI) run -t -i --sig-proxy=true -u $(UID) --rm \
|
|||
--mount type=volume,source=home,destination="/home" \
|
||||
-w /work $(IMG)
|
||||
else
|
||||
$(info Building with your local toolchain.)
|
||||
RUN =
|
||||
endif
|
||||
|
||||
|
|
|
@ -1 +1 @@
|
|||
b911e0db0ccb611ae4fd361d295af2ef5f8089d7
|
||||
43fd6b490e127211ff84244490071e6872da2847
|
||||
|
|
|
@ -70,6 +70,14 @@ while read -r line; do
|
|||
LD_EXTRAFLAGS="${LD_EXTRAFLAGS} -X ${line}"
|
||||
done < "${BUILDINFO}"
|
||||
|
||||
# verify go version before build
|
||||
# NB. this was copied verbatim from Kubernetes hack
|
||||
minimum_go_version=go1.13 # supported patterns: go1.x, go1.x.x (x should be a number)
|
||||
IFS=" " read -ra go_version <<< "$(${GOBINARY} version)"
|
||||
if [[ "${minimum_go_version}" != $(echo -e "${minimum_go_version}\n${go_version[2]}" | sort -s -t. -k 1,1 -k 2,2n -k 3,3n | head -n1) && "${go_version[2]}" != "devel" ]]; then
|
||||
echo "Warning: Detected that you are using an older version of the Go compiler. Istio requires ${minimum_go_version} or greater."
|
||||
fi
|
||||
|
||||
time GOOS=${BUILD_GOOS} GOARCH=${BUILD_GOARCH} ${GOBINARY} build \
|
||||
${V} "${GOBUILDFLAGS_ARRAY[@]}" ${GCFLAGS:+-gcflags "${GCFLAGS}"} \
|
||||
-o "${OUT}" \
|
||||
|
|
|
@ -2,6 +2,6 @@
|
|||
publish = "public"
|
||||
|
||||
[build.environment]
|
||||
HUGO_VERSION = "0.55.5"
|
||||
HUGO_VERSION = "0.58.2"
|
||||
NODE_VERSION = "12.8.0"
|
||||
BUILD_WITH_CONTAINER = "0"
|
||||
|
|
Loading…
Reference in New Issue