From 77b7a784530a0f2be12a09369727bc51ad382768 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Mon, 3 Nov 2025 14:54:40 -0500 Subject: [PATCH 1/4] Add ability for local makefile with personal customizations that wouldn't affect upstream --- .gitignore | 3 +++ Makefile | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/.gitignore b/.gitignore index 821b1b8c672e8..6bd8f5890526d 100644 --- a/.gitignore +++ b/.gitignore @@ -124,3 +124,6 @@ prime/ /AGENT.md /CLAUDE.md /llms.txt + +# a makefile for personal convenience make targets +Makefile.local diff --git a/Makefile b/Makefile index 7531e56d83406..a981fa5600cec 100644 --- a/Makefile +++ b/Makefile @@ -199,6 +199,10 @@ TEST_MSSQL_DBNAME ?= gitea TEST_MSSQL_USERNAME ?= sa TEST_MSSQL_PASSWORD ?= MwantsaSecurePassword1 +# Include local personalizations +# Makefile.local is gitignored +sinclude Makefile.local + .PHONY: all all: build From 85cf2c31e2a9d119fed5d11d60295de3c1355a33 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Tue, 4 Nov 2025 01:22:11 +0100 Subject: [PATCH 2/4] Update .gitattributes for Makefile.* detection --- .gitattributes | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitattributes b/.gitattributes index e218bbe25df9e..afd02555f5974 100644 --- a/.gitattributes +++ b/.gitattributes @@ -8,3 +8,4 @@ /vendor/** -text -eol linguist-vendored /web_src/js/vendor/** -text -eol linguist-vendored Dockerfile.* linguist-language=Dockerfile +Makefile.* linguist-language=Makefile From ecddae2fad16d658ac68756d132809d092c16622 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Tue, 4 Nov 2025 01:23:06 +0100 Subject: [PATCH 3/4] update comments in makefile --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index a981fa5600cec..0a09fec2c36e0 100644 --- a/Makefile +++ b/Makefile @@ -199,8 +199,8 @@ TEST_MSSQL_DBNAME ?= gitea TEST_MSSQL_USERNAME ?= sa TEST_MSSQL_PASSWORD ?= MwantsaSecurePassword1 -# Include local personalizations -# Makefile.local is gitignored +# Include local Makefile +# Makefile.local is listed in .gitignore sinclude Makefile.local .PHONY: all From 96c309b4df7246c968fa7ef056494e3faa0db2ad Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Tue, 4 Nov 2025 01:23:28 +0100 Subject: [PATCH 4/4] Update comment for Makefile in .gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 401b6129b80f7..11af4543bd200 100644 --- a/.gitignore +++ b/.gitignore @@ -128,5 +128,5 @@ prime/ # Ignore worktrees when working on multiple branches .worktrees/ -# a makefile for personal convenience make targets +# A Makefile for custom make targets Makefile.local