From e343023a223bcf3c5e2ba6ae117929dd621638e7 Mon Sep 17 00:00:00 2001 From: Danny Kopping Date: Tue, 2 Jul 2024 11:34:09 +0200 Subject: [PATCH 1/2] Execute rbacgen even if dependencies' mod times are older than source file Signed-off-by: Danny Kopping --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index c3059800c7515..9f307c0d06ea9 100644 --- a/Makefile +++ b/Makefile @@ -616,9 +616,11 @@ site/src/theme/icons.json: $(wildcard scripts/gensite/*) $(wildcard site/static/ 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 +.PHONY: coderd/rbac/object_gen.go # force rebuilds if any dependencies' mtimes are less than the output file coderd/rbac/object_gen.go: scripts/rbacgen/rbacobject.gotmpl scripts/rbacgen/main.go coderd/rbac/object.go go run scripts/rbacgen/main.go rbac > coderd/rbac/object_gen.go +.PHONY: codersdk/rbacresources_gen.go # force rebuilds if any dependencies' mtimes are less than the output file codersdk/rbacresources_gen.go: scripts/rbacgen/codersdk.gotmpl scripts/rbacgen/main.go coderd/rbac/object.go go run scripts/rbacgen/main.go codersdk > codersdk/rbacresources_gen.go From 2b623df676a69035c786a732f0e71789cd32e9fb Mon Sep 17 00:00:00 2001 From: Danny Kopping Date: Tue, 2 Jul 2024 16:17:36 +0200 Subject: [PATCH 2/2] Review comments Signed-off-by: Danny Kopping --- Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 9f307c0d06ea9..0cd253efa6c1d 100644 --- a/Makefile +++ b/Makefile @@ -518,6 +518,7 @@ gen/mark-fresh: $(DB_GEN_FILES) \ site/src/api/typesGenerated.ts \ coderd/rbac/object_gen.go \ + codersdk/rbacresources_gen.go \ docs/admin/prometheus.md \ docs/cli.md \ docs/admin/audit-logs.md \ @@ -616,12 +617,10 @@ site/src/theme/icons.json: $(wildcard scripts/gensite/*) $(wildcard site/static/ 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 -.PHONY: coderd/rbac/object_gen.go # force rebuilds if any dependencies' mtimes are less than the output file -coderd/rbac/object_gen.go: scripts/rbacgen/rbacobject.gotmpl scripts/rbacgen/main.go coderd/rbac/object.go +coderd/rbac/object_gen.go: scripts/rbacgen/rbacobject.gotmpl scripts/rbacgen/main.go coderd/rbac/object.go coderd/rbac/policy/policy.go go run scripts/rbacgen/main.go rbac > coderd/rbac/object_gen.go -.PHONY: codersdk/rbacresources_gen.go # force rebuilds if any dependencies' mtimes are less than the output file -codersdk/rbacresources_gen.go: scripts/rbacgen/codersdk.gotmpl scripts/rbacgen/main.go coderd/rbac/object.go +codersdk/rbacresources_gen.go: scripts/rbacgen/codersdk.gotmpl scripts/rbacgen/main.go coderd/rbac/object.go coderd/rbac/policy/policy.go go run scripts/rbacgen/main.go codersdk > codersdk/rbacresources_gen.go docs/admin/prometheus.md: scripts/metricsdocgen/main.go scripts/metricsdocgen/metrics