From 6c7b07be60b756685fa114325abc4ae63cd0f45f Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Tue, 14 Mar 2023 18:43:05 +0800 Subject: [PATCH] Fix make don't rebuild when go.mod changed (#49) Fix #13 Reviewed-on: https://gitea.com/gitea/act_runner/pulls/49 Reviewed-by: delvh --- Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index f3ddda8..af33e75 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,8 @@ RUNNER_CMD_PACKAGE_PATH := codeberg.org/forgejo/runner/cmd LINUX_ARCHS ?= linux/amd64,linux/arm64 DARWIN_ARCHS ?= darwin-12/amd64,darwin-12/arm64 WINDOWS_ARCHS ?= windows/amd64 -GOFILES := $(shell find . -type f -name "*.go" ! -name "generated.*") +GO_FMT_FILES := $(shell find . -type f -name "*.go" ! -name "generated.*") +GOFILES := $(shell find . -type f -name "*.go" -o -name "go.mod" ! -name "generated.*") ifneq ($(shell uname), Darwin) EXTLDFLAGS = -extldflags "-static" $(null) @@ -70,7 +71,7 @@ fmt: @hash gofumpt > /dev/null 2>&1; if [ $$? -ne 0 ]; then \ $(GO) install mvdan.cc/gofumpt@latest; \ fi - $(GOFMT) -w $(GOFILES) + $(GOFMT) -w $(GO_FMT_FILES) vet: $(GO) vet ./... @@ -80,7 +81,7 @@ fmt-check: @hash gofumpt > /dev/null 2>&1; if [ $$? -ne 0 ]; then \ $(GO) install mvdan.cc/gofumpt@latest; \ fi - @diff=$$($(GOFMT) -d $(GOFILES)); \ + @diff=$$($(GOFMT) -d $(GO_FMT_FILES)); \ if [ -n "$$diff" ]; then \ echo "Please run 'make fmt' and commit the result:"; \ echo "$${diff}"; \