mirror of
https://github.com/woodpecker-ci/woodpecker.git
synced 2025-10-21 23:28:17 +00:00
Minim golang 1.18 and drop vendor folder (#979)
This commit is contained in:
47
Makefile
47
Makefile
@@ -23,7 +23,7 @@ CGO_CFLAGS ?=
|
||||
|
||||
HAS_GO = $(shell hash go > /dev/null 2>&1 && echo "GO" || echo "NOGO" )
|
||||
ifeq ($(HAS_GO), GO)
|
||||
XGO_VERSION ?= go-1.17.x
|
||||
XGO_VERSION ?= go-1.18.x
|
||||
CGO_CFLAGS ?= $(shell $(GO) env CGO_CFLAGS)
|
||||
endif
|
||||
|
||||
@@ -35,7 +35,7 @@ ifeq (in_docker,$(firstword $(MAKECMDGOALS)))
|
||||
$(eval $(MAKE_ARGS):;@:)
|
||||
|
||||
in_docker:
|
||||
@[ "1" == "$(shell docker image ls woodpecker/make:local -a | wc -l)" ] && docker build -f ./docker/Dockerfile.make -t woodpecker/make:local . || echo reuse existing docker image
|
||||
@[ "1" -eq "$(shell docker image ls woodpecker/make:local -a | wc -l)" ] && docker build -f ./docker/Dockerfile.make -t woodpecker/make:local . || echo reuse existing docker image
|
||||
@echo run in docker:
|
||||
@docker run -it \
|
||||
--user $(shell id -u):$(shell id -g) \
|
||||
@@ -70,13 +70,13 @@ clean:
|
||||
@[ "1" != "$(shell docker image ls woodpecker/make:local -a | wc -l)" ] && docker image rm woodpecker/make:local || echo no docker image to clean
|
||||
|
||||
.PHONY: lint
|
||||
lint:
|
||||
lint: install-tools
|
||||
@echo "Running golangci-lint"
|
||||
go run vendor/github.com/golangci/golangci-lint/cmd/golangci-lint/main.go run --timeout 5m
|
||||
golangci-lint run --timeout 5m
|
||||
@echo "Running zerolog linter"
|
||||
go run vendor/github.com/rs/zerolog/cmd/lint/lint.go github.com/woodpecker-ci/woodpecker/cmd/agent
|
||||
go run vendor/github.com/rs/zerolog/cmd/lint/lint.go github.com/woodpecker-ci/woodpecker/cmd/cli
|
||||
go run vendor/github.com/rs/zerolog/cmd/lint/lint.go github.com/woodpecker-ci/woodpecker/cmd/server
|
||||
lint github.com/woodpecker-ci/woodpecker/cmd/agent
|
||||
lint github.com/woodpecker-ci/woodpecker/cmd/cli
|
||||
lint github.com/woodpecker-ci/woodpecker/cmd/server
|
||||
|
||||
frontend-dependencies:
|
||||
(cd web/; yarn install --frozen-lockfile)
|
||||
@@ -133,6 +133,14 @@ check-xgo:
|
||||
$(GO) install src.techknowlogick.com/xgo@latest; \
|
||||
fi
|
||||
|
||||
install-tools:
|
||||
@hash golangci-lint > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
|
||||
go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest; \
|
||||
fi ; \
|
||||
hash lint > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
|
||||
go install github.com/rs/zerolog/cmd/lint@latest; \
|
||||
fi
|
||||
|
||||
cross-compile-server:
|
||||
$(foreach platform,$(subst ;, ,$(PLATFORMS)),\
|
||||
TARGETOS=$(firstword $(subst |, ,$(platform))) \
|
||||
@@ -191,6 +199,31 @@ release-cli:
|
||||
tar -cvzf dist/woodpecker-cli_darwin_amd64.tar.gz -C dist/cli/darwin_amd64 woodpecker-cli
|
||||
tar -cvzf dist/woodpecker-cli_darwin_arm64.tar.gz -C dist/cli/darwin_arm64 woodpecker-cli
|
||||
|
||||
release-tarball:
|
||||
tar -cvzf dist/woodpecker-src-$(BUILD_VERSION).tar.gz \
|
||||
agent \
|
||||
cli \
|
||||
cmd \
|
||||
go.??? \
|
||||
LICENSE \
|
||||
Makefile \
|
||||
pipeline \
|
||||
server \
|
||||
shared \
|
||||
vendor \
|
||||
version \
|
||||
woodpecker-go \
|
||||
web/index.html \
|
||||
web/node_modules \
|
||||
web/package.json \
|
||||
web/public \
|
||||
web/src \
|
||||
web/package.json \
|
||||
web/tsconfig.* \
|
||||
web/*.ts \
|
||||
web/yarn.lock \
|
||||
web/web.go
|
||||
|
||||
release-checksums:
|
||||
# generate shas for tar files
|
||||
(cd dist/; sha256sum *.* > checksums.txt)
|
||||
|
Reference in New Issue
Block a user