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

Skip to content

Commit f4b6f42

Browse files
mafredrimafredri
authored
chore(Makefile): fix dependencies and timestamps (#17040)
This change should reduce "infinite" dependency cycles. I added some unnecessary `touch`es for completeness.
1 parent 6908c1b commit f4b6f42

File tree

1 file changed

+34
-21
lines changed

1 file changed

+34
-21
lines changed

‎Makefile‎

Lines changed: 34 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -388,16 +388,17 @@ $(foreach chart,$(charts),build/$(chart)_helm_$(VERSION).tgz): build/%_helm_$(VE
388388
--chart $* \
389389
--output "$@"
390390

391-
node_modules/.installed: package.json
391+
node_modules/.installed: package.json pnpm-lock.yaml
392392
./scripts/pnpm_install.sh
393+
touch "$@"
393394

394-
offlinedocs/node_modules/.installed: offlinedocs/package.json
395-
cd offlinedocs/
396-
../scripts/pnpm_install.sh
395+
offlinedocs/node_modules/.installed: offlinedocs/package.json offlinedocs/pnpm-lock.yaml
396+
(cd offlinedocs/ && ../scripts/pnpm_install.sh)
397+
touch "$@"
397398

398-
site/node_modules/.installed: site/package.json
399-
cd site/
400-
../scripts/pnpm_install.sh
399+
site/node_modules/.installed: site/package.json site/pnpm-lock.yaml
400+
(cd site/ && ../scripts/pnpm_install.sh)
401+
touch "$@"
401402

402403
SITE_GEN_FILES := \
403404
site/src/api/typesGenerated.ts \
@@ -631,27 +632,34 @@ gen/mark-fresh:
631632
# applied.
632633
coderd/database/dump.sql: coderd/database/gen/dump/main.go $(wildcard coderd/database/migrations/*.sql)
633634
go run ./coderd/database/gen/dump/main.go
635+
touch "$@"
634636

635637
# Generates Go code for querying the database.
636638
# coderd/database/queries.sql.go
637639
# coderd/database/models.go
638640
coderd/database/querier.go: coderd/database/sqlc.yaml coderd/database/dump.sql $(wildcard coderd/database/queries/*.sql)
639641
./coderd/database/generate.sh
642+
touch "$@"
640643

641644
coderd/database/dbmock/dbmock.go: coderd/database/db.go coderd/database/querier.go
642645
go generate ./coderd/database/dbmock/
646+
touch "$@"
643647

644648
coderd/database/pubsub/psmock/psmock.go: coderd/database/pubsub/pubsub.go
645649
go generate ./coderd/database/pubsub/psmock
650+
touch "$@"
646651

647652
agent/agentcontainers/acmock/acmock.go: agent/agentcontainers/containers.go
648653
go generate ./agent/agentcontainers/acmock/
654+
touch "$@"
649655

650656
agent/agentcontainers/dcspec/dcspec_gen.go: agent/agentcontainers/dcspec/devContainer.base.schema.json
651657
go generate ./agent/agentcontainers/dcspec/
658+
touch "$@"
652659

653660
$(TAILNETTEST_MOCKS): tailnet/coordinator.go tailnet/service.go
654661
go generate ./tailnet/tailnettest/
662+
touch "$@"
655663

656664
tailnet/proto/tailnet.pb.go: tailnet/proto/tailnet.proto
657665
protoc \
@@ -694,66 +702,71 @@ vpn/vpn.pb.go: vpn/vpn.proto
694702
site/src/api/typesGenerated.ts: site/node_modules/.installed $(wildcard scripts/apitypings/*) $(shell find ./codersdk $(FIND_EXCLUSIONS) -type f -name '*.go')
695703
# -C sets the directory for the go run command
696704
go run -C ./scripts/apitypings main.go > $@
697-
cd site/
698-
pnpm exec biome format --write src/api/typesGenerated.ts
705+
(cd site/ && pnpm exec biome format --write src/api/typesGenerated.ts)
706+
touch "$@"
699707

700708
site/e2e/provisionerGenerated.ts: site/node_modules/.installed provisionerd/proto/provisionerd.pb.go provisionersdk/proto/provisioner.pb.go
701-
cd site/
702-
pnpm run gen:provisioner
709+
(cd site/ && pnpm run gen:provisioner)
710+
touch "$@"
703711

704712
site/src/theme/icons.json: site/node_modules/.installed $(wildcard scripts/gensite/*) $(wildcard site/static/icon/*)
705713
go run ./scripts/gensite/ -icons "$@"
706-
cd site/
707-
pnpm exec biome format --write src/theme/icons.json
714+
(cd site/ && pnpm exec biome format --write src/theme/icons.json)
715+
touch "$@"
708716

709717
examples/examples.gen.json: scripts/examplegen/main.go examples/examples.go $(shell find ./examples/templates)
710718
go run ./scripts/examplegen/main.go > examples/examples.gen.json
719+
touch "$@"
711720

712721
coderd/rbac/object_gen.go: scripts/typegen/rbacobject.gotmpl scripts/typegen/main.go coderd/rbac/object.go coderd/rbac/policy/policy.go
713722
tempdir=$(shell mktemp -d /tmp/typegen_rbac_object.XXXXXX)
714723
go run ./scripts/typegen/main.go rbac object > "$$tempdir/object_gen.go"
715724
mv -v "$$tempdir/object_gen.go" coderd/rbac/object_gen.go
716725
rmdir -v "$$tempdir"
726+
touch "$@"
717727

718728
codersdk/rbacresources_gen.go: scripts/typegen/codersdk.gotmpl scripts/typegen/main.go coderd/rbac/object.go coderd/rbac/policy/policy.go
719729
# Do no overwrite codersdk/rbacresources_gen.go directly, as it would make the file empty, breaking
720730
# the `codersdk` package and any parallel build targets.
721731
go run scripts/typegen/main.go rbac codersdk > /tmp/rbacresources_gen.go
722732
mv /tmp/rbacresources_gen.go codersdk/rbacresources_gen.go
733+
touch "$@"
723734

724735
site/src/api/rbacresourcesGenerated.ts: site/node_modules/.installed scripts/typegen/codersdk.gotmpl scripts/typegen/main.go coderd/rbac/object.go coderd/rbac/policy/policy.go
725736
go run scripts/typegen/main.go rbac typescript > "$@"
726-
cd site/
727-
pnpm exec biome format --write src/api/rbacresourcesGenerated.ts
737+
(cd site/ && pnpm exec biome format --write src/api/rbacresourcesGenerated.ts)
738+
touch "$@"
728739

729740
site/src/api/countriesGenerated.ts: site/node_modules/.installed scripts/typegen/countries.tstmpl scripts/typegen/main.go codersdk/countries.go
730741
go run scripts/typegen/main.go countries > "$@"
731-
cd site/
732-
pnpm exec biome format --write src/api/countriesGenerated.ts
742+
(cd site/ && pnpm exec biome format --write src/api/countriesGenerated.ts)
743+
touch "$@"
733744

734745
docs/admin/integrations/prometheus.md: node_modules/.installed scripts/metricsdocgen/main.go scripts/metricsdocgen/metrics
735746
go run scripts/metricsdocgen/main.go
736747
pnpm exec markdownlint-cli2 --fix ./docs/admin/integrations/prometheus.md
737748
pnpm exec markdown-table-formatter ./docs/admin/integrations/prometheus.md
749+
touch "$@"
738750

739751
docs/reference/cli/index.md: node_modules/.installed site/node_modules/.installed scripts/clidocgen/main.go examples/examples.gen.json $(GO_SRC_FILES)
740752
CI=true BASE_PATH="." go run ./scripts/clidocgen
741753
pnpm exec markdownlint-cli2 --fix ./docs/reference/cli/*.md
742754
pnpm exec markdown-table-formatter ./docs/reference/cli/*.md
743-
cd site/
744-
pnpm exec biome format --write ../docs/manifest.json
755+
(cd site/ && pnpm exec biome format --write ../docs/manifest.json)
756+
touch "$@"
745757

746758
docs/admin/security/audit-logs.md: node_modules/.installed coderd/database/querier.go scripts/auditdocgen/main.go enterprise/audit/table.go coderd/rbac/object_gen.go
747759
go run scripts/auditdocgen/main.go
748760
pnpm exec markdownlint-cli2 --fix ./docs/admin/security/audit-logs.md
749761
pnpm exec markdown-table-formatter ./docs/admin/security/audit-logs.md
762+
touch "$@"
750763

751764
coderd/apidoc/swagger.json: node_modules/.installed site/node_modules/.installed $(shell find ./scripts/apidocgen $(FIND_EXCLUSIONS) -type f) $(wildcard coderd/*.go) $(wildcard enterprise/coderd/*.go) $(wildcard codersdk/*.go) $(wildcard enterprise/wsproxy/wsproxysdk/*.go) $(DB_GEN_FILES) .swaggo docs/manifest.json coderd/rbac/object_gen.go
752765
./scripts/apidocgen/generate.sh
753766
pnpm exec markdownlint-cli2 --fix ./docs/reference/api/*.md
754767
pnpm exec markdown-table-formatter ./docs/reference/api/*.md
755-
cd site/
756-
pnpm exec biome format --write ../docs/manifest.json ../coderd/apidoc/swagger.json
768+
(cd site/ && pnpm exec biome format --write ../docs/manifest.json ../coderd/apidoc/swagger.json)
769+
touch "$@"
757770

758771
update-golden-files:
759772
echo 'WARNING: This target is deprecated. Use "make gen/golden-files" instead.' 2>&1

0 commit comments

Comments
 (0)