Thanks to visit codestin.com
Credit goes to github.com

Skip to content

chore: Find source files once in Makefile targets #4968

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

Merged
merged 3 commits into from
Nov 9, 2022
Merged

chore: Find source files once in Makefile targets #4968

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6138ebc
chore: Find source files once in Makefile targets
mafredri Nov 9, 2022
ccdb21a
fix: Use find for shell files and improve perf via ignore dirs
mafredri Nov 9, 2022
201b4cc
fix: Even more exclusions
mafredri Nov 9, 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
22 changes: 13 additions & 9 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,11 @@ else
ZSTDFLAGS := -6
endif

# Source files used for make targets, evaluated on use.
GO_SRC_FILES = $(shell find . -not -path './vendor/*' -type f -name '*.go')
# All the shell files in the repo, excluding ignored files.
SHELL_SRC_FILES = $(shell shfmt -f . | grep -v "\.coderv2/")
Copy link
Member

Choose a reason for hiding this comment

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

Since we don't have shfmt installed in every single CI run now is a good opportunity to change this to a find instead to avoid "shfmt: command not found" messages in CI.

Copy link
Member Author

Choose a reason for hiding this comment

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

I like shfmt -f because it doesn't rely on file extension, can find scripts without as well. But on the flip side, we don't need that feature and if it simplifies CI then why not 👍🏻.


# All ${OS}_${ARCH} combos we build for. Windows binaries have the .exe suffix.
OS_ARCHES := \
linux_amd64 linux_arm64 linux_armv7 \
Expand Down Expand Up @@ -171,7 +176,7 @@ endef
# You should probably use the non-version targets above instead if you're
# calling this manually.
$(CODER_ALL_BINARIES): go.mod go.sum \
$(shell find . -not -path './vendor/*' -type f -name '*.go') \
$(GO_SRC_FILES) \
$(shell find ./examples/templates)

$(get-mode-os-arch-ext)
Expand Down Expand Up @@ -333,7 +338,7 @@ build/coder_helm_$(VERSION).tgz:
--version "$(VERSION)" \
--output "$@"

site/out/index.html: $(shell find ./site -not -path './site/node_modules/*' -type f -name '*.tsx') $(shell find ./site -not -path './site/node_modules/*' -type f -name '*.ts') site/package.json
site/out/index.html: site/package.json $(shell find ./site -not -path './site/node_modules/*' -type f \( -name '*.ts' -o -name '*.tsx' \))
./scripts/yarn_install.sh
cd site
yarn build
Expand Down Expand Up @@ -364,13 +369,13 @@ fmt/terraform: $(wildcard *.tf)
terraform fmt -recursive
.PHONY: fmt/terraform

fmt/shfmt: $(shell shfmt -f .)
fmt/shfmt: $(SHELL_SRC_FILES)
echo "--- shfmt"
# Only do diff check in CI, errors on diff.
ifdef CI
shfmt -d $(shell shfmt -f .)
shfmt -d $(SHELL_SRC_FILES)
else
shfmt -w $(shell shfmt -f .)
shfmt -w $(SHELL_SRC_FILES)
endif
.PHONY: fmt/shfmt

Expand All @@ -383,9 +388,9 @@ lint/go:
.PHONY: lint/go

# Use shfmt to determine the shell files, takes editorconfig into consideration.
lint/shellcheck: $(shell shfmt -f .)
lint/shellcheck: $(SHELL_SRC_FILES)
echo "--- shellcheck"
shellcheck --external-sources $(shell shfmt -f .)
shellcheck --external-sources $(SHELL_SRC_FILES)
.PHONY: lint/shellcheck

# all gen targets should be added here and to gen/mark-fresh
Expand Down Expand Up @@ -446,8 +451,7 @@ site/src/api/typesGenerated.ts: scripts/apitypings/main.go $(shell find codersdk
update-golden-files: cli/testdata/.gen-golden
.PHONY: update-golden-files

cli/testdata/.gen-golden: $(wildcard cli/testdata/*.golden) \
$(shell find . -not -path './vendor/*' -type f -name '*.go')
cli/testdata/.gen-golden: $(wildcard cli/testdata/*.golden) $(GO_SRC_FILES)

go test ./cli -run=TestCommandHelp -update
touch "$@"
Expand Down