Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Check go and nodejs version by go.mod and package.json, update Go official site URL #19197

Merged
merged 12 commits into from
Mar 26, 2022
Merged

Check go and nodejs version by go.mod and package.json, update Go official site URL #19197

Changes from 5 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
8ba8f67
Update string for go-check
gesangtome Mar 24, 2022
65e3d54
Use go version in `go.mod` instead of magic number
wxiaoguang Mar 24, 2022
402d1c7
use new golang site url
wxiaoguang Mar 24, 2022
fe7b886
use grep directly instead of cat
wxiaoguang Mar 24, 2022
1d8fff7
Revmoe magic number for nodejs version check
wxiaoguang Mar 24, 2022
d1d2df3
remove unnecessary MIN_NODE_VER_FMT
wxiaoguang Mar 24, 2022
8e4ae0a
fix message string
wxiaoguang Mar 24, 2022
124ff3d
Update Makefile
wxiaoguang Mar 24, 2022
220b3cc
Merge branch 'main' into main
wxiaoguang Mar 24, 2022
6cc8fe2
Merge branch 'main' into main
wxiaoguang Mar 25, 2022
af61490
Merge branch 'main' into main
wxiaoguang Mar 26, 2022
948516d
Merge branch 'main' into main
wxiaoguang Mar 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,12 @@ HAS_GO = $(shell hash $(GO) > /dev/null 2>&1 && echo "GO" || echo "NOGO" )
COMMA := ,

XGO_VERSION := go-1.18.x
MIN_GO_VERSION := 001017000
MIN_NODE_VERSION := 012017000

MIN_GO_VERSION_STR := $(shell grep -Eo '^go\s+[0-9]+\.[0-9.]+' go.mod | cut -d' ' -f2)
MIN_GO_VERSION := $(shell printf "%03d%03d%03d" $(shell echo '$(MIN_GO_VERSION_STR)' | tr '.' ' '))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The line above extracts 2 segments, but this seems to output 3. Is it correct?

Copy link
Contributor

@wxiaoguang wxiaoguang Mar 24, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It already has the 3-segments. The regex is [0-9.]*


MIN_NODE_VERSION_STR := $(shell grep -Eo '"node":.*[0-9.]+"' package.json | sed -n 's/.*[^0-9.]\([0-9.]*\)"/\1/p')
Copy link
Member

@silverwind silverwind Mar 24, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

May as well extract the third version segment as well because node version is always 3-segments as opposed to go version which is 2.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It already has the 3-segments. The regex is [0-9.]*

MIN_NODE_VERSION := $(shell printf "%03d%03d%03d" $(shell echo '$(MIN_NODE_VERSION_STR)' | tr '.' ' '))

AIR_PACKAGE ?= github.com/cosmtrek/air@v1.29.0
EDITORCONFIG_CHECKER_PACKAGE ?= github.com/editorconfig-checker/editorconfig-checker/cmd/editorconfig-checker@2.4.0
Expand Down Expand Up @@ -205,9 +209,10 @@ help:
go-check:
$(eval GO_VERSION := $(shell printf "%03d%03d%03d" $(shell $(GO) version | grep -Eo '[0-9]+\.[0-9.]+' | tr '.' ' ');))
@if [ "$(GO_VERSION)" -lt "$(MIN_GO_VERSION)" ]; then \
echo "Gitea requires Go 1.16 or greater to build. You can get it at https://golang.org/dl/"; \
echo "Gitea requires Go $(MIN_GO_VERSION_STR) or greater to build. You can get it at https://go.dev/dl/"; \
exit 1; \
fi
@echo "checked whether go matches min version: $(MIN_GO_VERSION_STR)"

.PHONY: git-check
git-check:
Expand All @@ -225,6 +230,7 @@ node-check:
echo "Gitea requires Node.js $(MIN_NODE_VER_FMT) or greater and npm to build. You can get it at https://nodejs.org/en/download/"; \
exit 1; \
fi
@echo "checked nodejs matches min version: $(MIN_NODE_VERSION_STR)"

.PHONY: clean-all
clean-all: clean
Expand Down