Skip to content

makefile: mount Git metadata for worktree support in Docker lint runs #1925

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
jtobin merged 1 commit into from
Jan 7, 2026
Merged

makefile: mount Git metadata for worktree support in Docker lint runs #1925

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 18 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,22 @@ ifneq ($(workers),)
LINT_WORKERS = --concurrency=$(workers)
endif

# Worktree support: golangci-lint's issues.new-from-rev compares against git
# history, but worktrees keep .git metadata outside the worktree root. When
# lint runs in Docker without those dirs mounted, new-from-rev cannot resolve,
# so we bind-mount the git dir/common dir into the container.
GIT_DIR := $(shell git rev-parse --git-dir 2>/dev/null)
GIT_COMMON_DIR := $(shell git rev-parse --git-common-dir 2>/dev/null)
DOCKER_GIT_MOUNTS :=
ifneq ($(filter /%,$(GIT_DIR)),)
DOCKER_GIT_MOUNTS += -v $(GIT_DIR):$(GIT_DIR)
endif
ifneq ($(filter /%,$(GIT_COMMON_DIR)),)
ifneq ($(GIT_COMMON_DIR),$(GIT_DIR))
DOCKER_GIT_MOUNTS += -v $(GIT_COMMON_DIR):$(GIT_COMMON_DIR)
endif
endif

# Docker cache mounting strategy:
# - CI (GitHub Actions): Use bind mounts to host paths that GA caches persist.
# - Local: Use Docker named volumes (much faster on macOS/Windows due to
Expand All @@ -63,6 +79,7 @@ DOCKER_TOOLS = docker run \
-v $${HOME}/.cache/go-build:/tmp/build/.cache \
-v $${HOME}/go/pkg/mod:/tmp/build/.modcache \
-v $${HOME}/.cache/golangci-lint:/root/.cache/golangci-lint \
$(DOCKER_GIT_MOUNTS) \
-v $$(pwd):/build taproot-assets-tools
else
# Local mode: Docker named volumes for fast macOS/Windows performance.
Expand All @@ -71,6 +88,7 @@ DOCKER_TOOLS = docker run \
-v tapd-go-build-cache:/tmp/build/.cache \
-v tapd-go-mod-cache:/tmp/build/.modcache \
-v tapd-go-lint-cache:/root/.cache/golangci-lint \
$(DOCKER_GIT_MOUNTS) \
-v $$(pwd):/build taproot-assets-tools
endif

Expand Down
Loading