Mar 24, 2025 · Mar 21, 2025 · Mar 24, 2025 · Mar 24, 2025 · Mar 24, 2025 · Mar 24, 2025
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
          set -euxo pipefail
          go mod download

          # The "build/coder-dylib" target depends on all Go source files and
          # the target "agent/agentcontainers/dcspec/dcspec_gen.go" depends on
          # node/pnpm tooling.
          mkdir -p node_modules
          touch node_modules/.installed

          make gen/mark-fresh
          make build/coder-dylib
        env:
diff --git a/Makefile b/Makefile
 -not \( \( -path '*/.git/*' -o -path './build/*' -o -path './vendor/*' -o -path './.coderv2/*' -o -path '*/node_modules/*' -o -path '*/out/*' -o -path './coderd/apidoc/*' -o -path '*/.next/*' -o -path '*/.terraform/*' \) -prune \)
 # Source files used for make targets, evaluated on use.
 GO_SRC_FILES := $(shell find . $(FIND_EXCLUSIONS) -type f -name '*.go' -not -name '*_test.go')
 # Same as GO_SRC_FILES but excluding certain files that have problematic
 # Makefile dependencies (e.g. pnpm).
 MOST_GO_SRC_FILES := $(shell \
 find . \
 $(FIND_EXCLUSIONS) \
 -type f \
 -name '*.go' \
 -not -name '*_test.go' \
 -not -wholename './agent/agentcontainers/dcspec/dcspec_gen.go' \
 )
 # All the shell files in the repo, excluding ignored files.
 SHELL_SRC_FILES := $(shell find . $(FIND_EXCLUSIONS) -type f -name '*.sh')

 fi

 # This task builds Coder Desktop dylibs
 $(CODER_DYLIBS): go.mod go.sum $(GO_SRC_FILES)
 $(CODER_DYLIBS): go.mod go.sum $(MOST_GO_SRC_FILES)
 @if [ "$(shell uname)" = "Darwin" ]; then
 $(get-mode-os-arch-ext)
 ./scripts/build_go.sh \
Original file line number	Diff line number	Diff line change
Expand Up		@@ -988,12 +988,6 @@ jobs:
		set -euxo pipefail
		go mod download

		# The "build/coder-dylib" target depends on all Go source files and
		# the target "agent/agentcontainers/dcspec/dcspec_gen.go" depends on
		# node/pnpm tooling.
		mkdir -p node_modules
		touch node_modules/.installed

		make gen/mark-fresh
		make build/coder-dylib
		env:
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -54,6 +54,16 @@ FIND_EXCLUSIONS= \
		-not \( \( -path '/.git/' -o -path './build/' -o -path './vendor/' -o -path './.coderv2/' -o -path '/node_modules/' -o -path '/out/' -o -path './coderd/apidoc/' -o -path '/.next/' -o -path '/.terraform/' \) -prune \)
		# Source files used for make targets, evaluated on use.
		GO_SRC_FILES := $(shell find . $(FIND_EXCLUSIONS) -type f -name '.go' -not -name '_test.go')
		# Same as GO_SRC_FILES but excluding certain files that have problematic
		# Makefile dependencies (e.g. pnpm).
		MOST_GO_SRC_FILES := $(shell \
Copy link Member deansheatherMar 24, 2025 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. To avoid the search again, could you do an inverse grep on GO_SRC_FILES instead perhaps? No stress if you have problems, this will be fine Copy link MemberAuthor mafredriMar 24, 2025 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. AFAIK the`:=` assignment should be evaluated only if used, so only for`make build/coder-dylib`? If we do an inverse grep then we always have to evaluate`GO_SRC_FILES` too? Copy link Member deansheatherMar 24, 2025 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. That's fair, all g then mafredri reacted with hooray emoji
		find . \
		$(FIND_EXCLUSIONS) \
		-type f \
		-name '*.go' \
		-not -name '*_test.go' \
		-not -wholename './agent/agentcontainers/dcspec/dcspec_gen.go' \
		)
		# All the shell files in the repo, excluding ignored files.
		SHELL_SRC_FILES := $(shell find . $(FIND_EXCLUSIONS) -type f -name '*.sh')

Expand DownExpand Up		@@ -243,7 +253,7 @@ $(CODER_ALL_BINARIES): go.mod go.sum \
		fi

		# This task builds Coder Desktop dylibs
		$(CODER_DYLIBS): go.mod go.sum $(GO_SRC_FILES)
		$(CODER_DYLIBS): go.mod go.sum $(MOST_GO_SRC_FILES)
		@if [ "$(shell uname)" = "Darwin" ]; then
		$(get-mode-os-arch-ext)
		./scripts/build_go.sh \
Expand Down