Skip to content

Add ability for local makefile with personal customizations that wouldnt affect remote repo #35836

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 10 commits into from
Nov 8, 2025
Merged

Add ability for local makefile with personal customizations that wouldnt affect remote repo #35836

merged 10 commits into from
Nov 8, 2025

Conversation

@techknowlogick
Copy link
Member

@techknowlogick techknowlogick commented Nov 3, 2025

This would allow developers to keep a local file that'd add personal makefile targets for niche convenience customization without having to have the git workspace polluted with uncommitted changes.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Nov 3, 2025
@techknowlogick techknowlogick added skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. backport/v1.25 and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Nov 3, 2025
qikp0
qikp0 reviewed Nov 3, 2025
View reviewed changes
Copy link

@qikp0 qikp0 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe the grammar could be improved.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Nov 3, 2025
@techknowlogick
Merge branch 'main' into local-makefile-customizations
124acaf 
Signed-off-by: techknowlogick <techknowlogick@gitea.com>
@techknowlogick
Copy link
Member Author

techknowlogick commented Nov 3, 2025

@charles25565 if you have a suggestion I'd be more than happy to update the comment (or PR title). I agree that it is not as straightforward as could be. :)

@silverwind
Copy link
Member

silverwind commented Nov 3, 2025 •
edited
Loading

My only problem is this filename, it's not recognized by linguist for example. Maybe we can find a filename that is or contribute Makefile.local to linguist?

@qikp0
Copy link

qikp0 commented Nov 3, 2025 •
edited
Loading

@charles25565 if you have a suggestion I'd be more than happy to update the comment (or PR title). I agree that it is not as straightforward as could be. :)

Strings should be:

-# a makefile for personal convenience make targets
+# A Makefile for custom make targets
-# Include local personalizations
-# Makefile.local is gitignored
+# Include local Makefile
+# Makefile.local is listed in .gitignore

@qikp0
Copy link

qikp0 commented Nov 3, 2025

My only problem is this filename, it's not recognized by linguist for example. Maybe we can find a filename that is or contribute Makefile.local to linguist?

It can also be done using .gitattributes.

@silverwind
Copy link
Member

silverwind commented Nov 3, 2025

Yes, if the filename stays, add Makefile.* linguist-language=Makefile to .gitattributes.

@techknowlogick
Copy link
Member Author

techknowlogick commented Nov 4, 2025

Thanks @charles25565 and @silverwind :) Your feedback was most helpful. I've updated the PR with the changes.

@lunny
Copy link
Member

lunny commented Nov 4, 2025

I couldn't find the reason to backport this PR.

@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Nov 4, 2025
@techknowlogick
Copy link
Member Author

techknowlogick commented Nov 4, 2025

@lunny I had the PR marked as backport, so that when switching to an older branch the Customized makefile wouldn't be accidentally included in a commit

@GiteaBot GiteaBot removed the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Nov 8, 2025
@GiteaBot GiteaBot added the lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. label Nov 8, 2025
@denyskon denyskon added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Nov 8, 2025
@denyskon denyskon enabled auto-merge (squash) November 8, 2025 19:20
@denyskon denyskon merged commit 9193486 into go-gitea:main Nov 8, 2025
25 checks passed
@GiteaBot GiteaBot added this to the 1.26.0 milestone Nov 8, 2025
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Nov 8, 2025
@GiteaBot
Copy link
Collaborator

GiteaBot commented Nov 9, 2025

I was unable to create a backport for 1.25. @techknowlogick, please send one manually. 🍵

go run ./contrib/backport 35836
...  // fix git conflicts if any
go run ./contrib/backport --continue

@GiteaBot GiteaBot added the backport/manual No power to the bots! Create your backport yourself! label Nov 9, 2025
zjjhot added a commit to zjjhot/gitea that referenced this pull request Nov 10, 2025
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
079ad07 
* giteaofficial/main:
  Allow to display embed images/pdfs when SERVE_DIRECT was enabled on MinIO storage (go-gitea#35882)
  Add proper page title for project pages (go-gitea#35773)
  Use correct form field for allowed force push users in branch protection API (go-gitea#35894)
  Fix team member access check (go-gitea#35899)
  Add ability for local makefile with personal customizations that wouldnt affect remote repo (go-gitea#35836)
  Add toolchain directive to go.mod (go-gitea#35901)
  Display source code downloads last for release attachments (go-gitea#35897)
  Fix conda null depend issue (go-gitea#35900)
  Fix avatar upload error handling (go-gitea#35887)
  Move `gitea-vet` to use `go tool` (go-gitea#35878)
  Contribution heatmap improvements (go-gitea#35876)
  Update to go 1.25.4 (go-gitea#35877)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@silverwind silverwind silverwind approved these changes

@denyskon denyskon denyskon approved these changes

+1 more reviewer

@qikp0 qikp0 qikp0 left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

backport/manual No power to the bots! Create your backport yourself! backport/v1.25 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/internal skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features.

Projects

None yet

Milestone

1.26.0

Development

Successfully merging this pull request may close these issues.

6 participants

@techknowlogick @silverwind @qikp0 @lunny @GiteaBot @denyskon