From 7740779b28e53cdf0a9780a39af71e3ee353e170 Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 14 Jul 2022 10:58:14 +0200 Subject: [PATCH] Fix versions check for busybox `sh` (#20358) `printf` in busybox emits a ugly 'invalid number' error when formatting string variables are present. Avoid that by reducing the go version check to just two digits, which ought to be enough as patch-level go versions are meant to be compatible. Avoid error on node-check as well. --- Makefile | 6 +++--- package-lock.json | 2 +- package.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 41d39b4c3232..5536788613c4 100644 --- a/Makefile +++ b/Makefile @@ -201,9 +201,9 @@ help: .PHONY: go-check go-check: - $(eval MIN_GO_VERSION_STR := $(shell grep -Eo '^go\s+[0-9]+\.[0-9.]+' go.mod | cut -d' ' -f2)) - $(eval MIN_GO_VERSION := $(shell printf "%03d%03d%03d" $(shell echo '$(MIN_GO_VERSION_STR)' | tr '.' ' '))) - $(eval GO_VERSION := $(shell printf "%03d%03d%03d" $(shell $(GO) version | grep -Eo '[0-9]+\.[0-9.]+' | tr '.' ' ');)) + $(eval MIN_GO_VERSION_STR := $(shell grep -Eo '^go\s+[0-9]+\.[0-9]+' go.mod | cut -d' ' -f2)) + $(eval MIN_GO_VERSION := $(shell printf "%03d%03d" $(shell echo '$(MIN_GO_VERSION_STR)' | tr '.' ' '))) + $(eval GO_VERSION := $(shell printf "%03d%03d" $(shell $(GO) version | grep -Eo '[0-9]+\.[0-9]+' | tr '.' ' ');)) @if [ "$(GO_VERSION)" -lt "$(MIN_GO_VERSION)" ]; then \ echo "Gitea requires Go $(MIN_GO_VERSION_STR) or greater to build. You can get it at https://go.dev/dl/"; \ exit 1; \ diff --git a/package-lock.json b/package-lock.json index 411a22037d12..5032e50fc525 100644 --- a/package-lock.json +++ b/package-lock.json @@ -61,7 +61,7 @@ "updates": "13.0.5" }, "engines": { - "node": ">= 14" + "node": ">= 14.0.0" } }, "node_modules/@ampproject/remapping": { diff --git a/package.json b/package.json index 1ec816fc569d..b55da05b3dec 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "private": true, "type": "module", "engines": { - "node": ">= 14" + "node": ">= 14.0.0" }, "dependencies": { "@claviska/jquery-minicolors": "2.3.6",