From 81988eedffcd29cf441c75e4eefef7bce6a2f1cd Mon Sep 17 00:00:00 2001 From: Mathias Fredriksson Date: Fri, 21 Mar 2025 13:05:41 +0000 Subject: [PATCH] chore(Makefile): fix dependencies and timestamps --- Makefile | 55 ++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 34 insertions(+), 21 deletions(-) diff --git a/Makefile b/Makefile index 2d2d02b5abc55..782ce165e12b0 100644 --- a/Makefile +++ b/Makefile @@ -388,16 +388,17 @@ $(foreach chart,$(charts),build/$(chart)_helm_$(VERSION).tgz): build/%_helm_$(VE --chart $* \ --output "$@" -node_modules/.installed: package.json +node_modules/.installed: package.json pnpm-lock.yaml ./scripts/pnpm_install.sh + touch "$@" -offlinedocs/node_modules/.installed: offlinedocs/package.json - cd offlinedocs/ - ../scripts/pnpm_install.sh +offlinedocs/node_modules/.installed: offlinedocs/package.json offlinedocs/pnpm-lock.yaml + (cd offlinedocs/ && ../scripts/pnpm_install.sh) + touch "$@" -site/node_modules/.installed: site/package.json - cd site/ - ../scripts/pnpm_install.sh +site/node_modules/.installed: site/package.json site/pnpm-lock.yaml + (cd site/ && ../scripts/pnpm_install.sh) + touch "$@" SITE_GEN_FILES := \ site/src/api/typesGenerated.ts \ @@ -631,27 +632,34 @@ gen/mark-fresh: # applied. coderd/database/dump.sql: coderd/database/gen/dump/main.go $(wildcard coderd/database/migrations/*.sql) go run ./coderd/database/gen/dump/main.go + touch "$@" # Generates Go code for querying the database. # coderd/database/queries.sql.go # coderd/database/models.go coderd/database/querier.go: coderd/database/sqlc.yaml coderd/database/dump.sql $(wildcard coderd/database/queries/*.sql) ./coderd/database/generate.sh + touch "$@" coderd/database/dbmock/dbmock.go: coderd/database/db.go coderd/database/querier.go go generate ./coderd/database/dbmock/ + touch "$@" coderd/database/pubsub/psmock/psmock.go: coderd/database/pubsub/pubsub.go go generate ./coderd/database/pubsub/psmock + touch "$@" agent/agentcontainers/acmock/acmock.go: agent/agentcontainers/containers.go go generate ./agent/agentcontainers/acmock/ + touch "$@" agent/agentcontainers/dcspec/dcspec_gen.go: agent/agentcontainers/dcspec/devContainer.base.schema.json go generate ./agent/agentcontainers/dcspec/ + touch "$@" $(TAILNETTEST_MOCKS): tailnet/coordinator.go tailnet/service.go go generate ./tailnet/tailnettest/ + touch "$@" tailnet/proto/tailnet.pb.go: tailnet/proto/tailnet.proto protoc \ @@ -694,66 +702,71 @@ vpn/vpn.pb.go: vpn/vpn.proto site/src/api/typesGenerated.ts: site/node_modules/.installed $(wildcard scripts/apitypings/*) $(shell find ./codersdk $(FIND_EXCLUSIONS) -type f -name '*.go') # -C sets the directory for the go run command go run -C ./scripts/apitypings main.go > $@ - cd site/ - pnpm exec biome format --write src/api/typesGenerated.ts + (cd site/ && pnpm exec biome format --write src/api/typesGenerated.ts) + touch "$@" site/e2e/provisionerGenerated.ts: site/node_modules/.installed provisionerd/proto/provisionerd.pb.go provisionersdk/proto/provisioner.pb.go - cd site/ - pnpm run gen:provisioner + (cd site/ && pnpm run gen:provisioner) + touch "$@" site/src/theme/icons.json: site/node_modules/.installed $(wildcard scripts/gensite/*) $(wildcard site/static/icon/*) go run ./scripts/gensite/ -icons "$@" - cd site/ - pnpm exec biome format --write src/theme/icons.json + (cd site/ && pnpm exec biome format --write src/theme/icons.json) + touch "$@" examples/examples.gen.json: scripts/examplegen/main.go examples/examples.go $(shell find ./examples/templates) go run ./scripts/examplegen/main.go > examples/examples.gen.json + touch "$@" coderd/rbac/object_gen.go: scripts/typegen/rbacobject.gotmpl scripts/typegen/main.go coderd/rbac/object.go coderd/rbac/policy/policy.go tempdir=$(shell mktemp -d /tmp/typegen_rbac_object.XXXXXX) go run ./scripts/typegen/main.go rbac object > "$$tempdir/object_gen.go" mv -v "$$tempdir/object_gen.go" coderd/rbac/object_gen.go rmdir -v "$$tempdir" + touch "$@" codersdk/rbacresources_gen.go: scripts/typegen/codersdk.gotmpl scripts/typegen/main.go coderd/rbac/object.go coderd/rbac/policy/policy.go # Do no overwrite codersdk/rbacresources_gen.go directly, as it would make the file empty, breaking # the `codersdk` package and any parallel build targets. go run scripts/typegen/main.go rbac codersdk > /tmp/rbacresources_gen.go mv /tmp/rbacresources_gen.go codersdk/rbacresources_gen.go + touch "$@" 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 go run scripts/typegen/main.go rbac typescript > "$@" - cd site/ - pnpm exec biome format --write src/api/rbacresourcesGenerated.ts + (cd site/ && pnpm exec biome format --write src/api/rbacresourcesGenerated.ts) + touch "$@" site/src/api/countriesGenerated.ts: site/node_modules/.installed scripts/typegen/countries.tstmpl scripts/typegen/main.go codersdk/countries.go go run scripts/typegen/main.go countries > "$@" - cd site/ - pnpm exec biome format --write src/api/countriesGenerated.ts + (cd site/ && pnpm exec biome format --write src/api/countriesGenerated.ts) + touch "$@" docs/admin/integrations/prometheus.md: node_modules/.installed scripts/metricsdocgen/main.go scripts/metricsdocgen/metrics go run scripts/metricsdocgen/main.go pnpm exec markdownlint-cli2 --fix ./docs/admin/integrations/prometheus.md pnpm exec markdown-table-formatter ./docs/admin/integrations/prometheus.md + touch "$@" docs/reference/cli/index.md: node_modules/.installed site/node_modules/.installed scripts/clidocgen/main.go examples/examples.gen.json $(GO_SRC_FILES) CI=true BASE_PATH="." go run ./scripts/clidocgen pnpm exec markdownlint-cli2 --fix ./docs/reference/cli/*.md pnpm exec markdown-table-formatter ./docs/reference/cli/*.md - cd site/ - pnpm exec biome format --write ../docs/manifest.json + (cd site/ && pnpm exec biome format --write ../docs/manifest.json) + touch "$@" 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 go run scripts/auditdocgen/main.go pnpm exec markdownlint-cli2 --fix ./docs/admin/security/audit-logs.md pnpm exec markdown-table-formatter ./docs/admin/security/audit-logs.md + touch "$@" 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 ./scripts/apidocgen/generate.sh pnpm exec markdownlint-cli2 --fix ./docs/reference/api/*.md pnpm exec markdown-table-formatter ./docs/reference/api/*.md - cd site/ - pnpm exec biome format --write ../docs/manifest.json ../coderd/apidoc/swagger.json + (cd site/ && pnpm exec biome format --write ../docs/manifest.json ../coderd/apidoc/swagger.json) + touch "$@" update-golden-files: echo 'WARNING: This target is deprecated. Use "make gen/golden-files" instead.' 2>&1 pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy