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

Simplify Makefiles, make golangci-lint work again #1615

Merged
merged 8 commits into from
May 25, 2023
+46 −156
Merged

Simplify Makefiles, make golangci-lint work again #1615

Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4791395
Makefile: rm ffjson
kolyshkin May 24, 2023
b7bf95e
Makefile: fix phony targets
kolyshkin May 24, 2023
b127912
docs/Makefile: add missing phony targets
kolyshkin May 24, 2023
afb3da6
Makefiles: simplify for modern go
kolyshkin May 24, 2023
f72893f
tests/tools: fix go version in go.mod
kolyshkin May 24, 2023
61b4037
tests/tools/Makefile: simplify golangci-lint installation
kolyshkin May 24, 2023
68ee78b
.golangci.yml: fix
kolyshkin May 24, 2023
ef4fda9
.cirrus.yml: simplify test_script
kolyshkin May 24, 2023
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
18 changes: 13 additions & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,31 @@ export GOPROXY=https://proxy.golang.org

.PHONY: \
all \
binary \
clean \
codespell \
containers-storage \
cross \
default \
docs \
gccgo \
help \
install \
install.docs \
install.tools \
lint \
local-binary \
local-cross \
local-gccgo \
local-test \
local-test-integration \
local-test-unit \
local-validate \
lint \
vendor
test-integration \
test-unit \
validate \
vendor \
vendor-in-container
kolyshkin marked this conversation as resolved.
Show resolved Hide resolved

PACKAGE := github.com/containers/storage
GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null)
Expand Down Expand Up @@ -78,9 +89,6 @@ local-validate validate: install.tools ## validate DCO and gofmt on the host
install.tools:
$(MAKE) -C tests/tools

$(FFJSON):
$(MAKE) -C tests/tools

install.docs: docs
$(MAKE) -C docs install

Expand Down