-
Notifications
You must be signed in to change notification settings - Fork 4.2k
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.
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
Infrastructure "Packaged Ultica in a git submodule repository" #46218
Conversation
(sigh) |
|
This is a big deal and what I consider one of the ultimate goals of moving all our tilesets to a separate repo. If it works as advertised it allows way more flexible updating of tilesets while also reducing unnecessary bloat by storing a bunch of graphics in the main repo. |
Listed another possible alternative in the OP comment. |
for coverting SSH submodule links into HTTPS ones when needed
as I'm not sure yet if it's beneficial
This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions. Please do not 'bump' or comment on this issue unless you are actively working on it. Stale issues, and stale issues that are closed are still considered. |
Status? |
Not sure if this solution is acceptable for everyone. Would like to receive a clear indication that there is a chance this will be merged before spending time on resolving merge conflicts. |
Note to self: check if it will set the |
$ git submodule update --init --remote gfx/UltimateCataclysm | ||
# Will get you the latest available commit in the default branch (main). | ||
# If this commit has not been recorded by the CDDA repository yet | ||
# it will have to be committed or ignored |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is there a better way? Didn't check yet.
This PR can go, I think. I'll leave the branch in case anyone wants to retry :) |
Summary
SUMMARY: Infrastructure "Packaged Ultica moved into a separate repository and linked back with git submodule"
Purpose of change
Decrease default local clone size, decrease history size, automate including latest Ultica version.
Describe the solution
Created a new GitHub organization for managing tilesets at https://github.com/CDDA-Tilesets
It is currently co-owned by @I-am-Erk, me, @Fris0uman and @John-Candlebury. Other tileset authors who follow licensing restrictions and CDDA maintainers are welcome to join. I'm also ready to transfer ownership to CDDA maintainers completely to reduce the risk of "supply chain" attacks. Or the setup can be replicated within the CleverRaven org.
❓ Will the build scripts include the
gfx/UltimateCataclysm/.git
folder into the release?Note that
git submodule
by default is in detached HEAD state because a specific commit is referenced. Trygit reset --hard origin/main
from withing submodule to go to the latest commit. This will change the referenced commit and you will have the ability to commit new reference from outside the submodule directory.Describe alternatives you've considered
Not changing default branch from
master
tomain
. But I like the idea and did it.Added later: I believe it's also possible to entirely implement getting latest version directly from Ultica repo and feeding it to
compose.py
with GitHub actions or the build script but that would create additional load on CI and it's already taking hours to run on almost any PR. And it may complicate things more (compared to having a git submodule) for people who want to have a copy of Ultica in their local clone.Testing
AFAIU needs to be tested by the GitHub infrastructure directly.
Additional context
#28707
I-am-Erk/CDDA-Tilesets#343
https://discord.com/channels/552510581161066497/552510581782085654/789461765230297098