From 780b654e5764cbbe12be5be991b1eafbf27a4718 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Tue, 26 May 2026 13:41:48 +0200 Subject: [PATCH 1/2] Fix commit.txt always checked Even if the commit.txt is unchanged, it must still be touched so this rule is not always executed. --- broker/Makefile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/broker/Makefile b/broker/Makefile index 2d2bb792..1317398d 100644 --- a/broker/Makefile +++ b/broker/Makefile @@ -86,10 +86,7 @@ $(SQL_GEN_OUT): $(SQL_GEN_IN) $(SQLC_CONFIG) $(SQLC) generate -f $(SQLC_CONFIG) $(COMMIT_ID): $(GIT_COMMIT_DEPS) - commit="$$( $(GIT) rev-parse --short HEAD )"; \ - if [ ! -f "$@" ] || [ "$$(cat "$@")" != "$$commit" ]; then \ - printf "%s" "$$commit" > "$@"; \ - fi + $(GIT) rev-parse --short HEAD | tr -d '\n' > $(COMMIT_ID) $(BINARY): $(COMMIT_ID) $(SQL_GEN_OUT) $(OAPI_GEN) $(PR_OAPI_GEN) $(PS_OAPI_GEN) $(BUILD_GOFILES) $(RETURNABLES_JSON) $(PULLSLIP_TEMPLATE) $(GO) build -v -o $(BINARY) ./$(MAIN_PACKAGE) From 84065482b5c7128e4f6f3db38f85977676ca296d Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Thu, 28 May 2026 14:55:13 +0200 Subject: [PATCH 2/2] Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- broker/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/broker/Makefile b/broker/Makefile index ebae7991..f5349597 100644 --- a/broker/Makefile +++ b/broker/Makefile @@ -96,7 +96,7 @@ $(SQL_GEN_OUT): $(SQL_GEN_IN) $(SQLC_CONFIG) $(SQLC) generate -f $(SQLC_CONFIG) $(COMMIT_ID): $(GIT_COMMIT_DEPS) - $(GIT) rev-parse --short HEAD | tr -d '\n' > $(COMMIT_ID) + commit_id="$$( $(GIT) rev-parse --short HEAD )" && printf '%s' "$$commit_id" > $(COMMIT_ID) $(BINARY): $(COMMIT_ID) $(SQL_GEN_OUT) $(OAPI_GEN) $(PR_OAPI_GEN) $(PS_OAPI_GEN) $(SCHED_OAPI_GEN) $(BUILD_GOFILES) $(RETURNABLES_JSON) $(PULLSLIP_TEMPLATE) $(GO) build -v -o $(BINARY) ./$(MAIN_PACKAGE)