Skip to content
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

Closed
wants to merge 12 commits into from

Conversation

int-ua
Copy link
Contributor

@int-ua int-ua commented Dec 21, 2020

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. Try git 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 to main. 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

@int-ua int-ua requested a review from I-am-Erk as a code owner December 21, 2020 14:19
@int-ua
Copy link
Contributor Author

int-ua commented Dec 21, 2020

E: The repository 'https://apt.postgresql.org/pub/repos/apt bionic-pgdg Release' no longer has a Release file.

(sigh)

@int-ua int-ua marked this pull request as draft December 21, 2020 14:57
@int-ua int-ua marked this pull request as ready for review December 21, 2020 15:09
@int-ua
Copy link
Contributor Author

int-ua commented Dec 21, 2020

I think I'll also try to preserve the commit history of that folder in the new repo. Mostly to show that it's possible.
Edit: I changed my mind, the history will still be preserved in the main repo.

@int-ua int-ua marked this pull request as draft December 21, 2020 16:34
@int-ua int-ua marked this pull request as ready for review December 21, 2020 17:50
@I-am-Erk I-am-Erk added Code: Infrastructure / Style / Static Analysis Code internal infrastructure and style SDL: Tiles / Sound Tiles visual interface and sounds. labels Dec 21, 2020
@I-am-Erk
Copy link
Member

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.

@int-ua int-ua changed the title [CR] Packaged Ultica in a submodule repository [CR] Packaged Ultica in a git submodule repository Dec 21, 2020
@int-ua
Copy link
Contributor Author

int-ua commented Dec 23, 2020

Listed another possible alternative in the OP comment.

@int-ua int-ua changed the title [CR] Packaged Ultica in a git submodule repository Packaged Ultica in a git submodule repository Dec 23, 2020
@int-ua int-ua changed the title Packaged Ultica in a git submodule repository [CR] Packaged Ultica in a git submodule repository Dec 23, 2020
@int-ua int-ua marked this pull request as draft December 23, 2020 14:37
@int-ua int-ua marked this pull request as ready for review December 23, 2020 15:02
@int-ua int-ua marked this pull request as draft December 23, 2020 15:22
@int-ua int-ua marked this pull request as ready for review December 23, 2020 15:58
.github/CONTRIBUTING.md Outdated Show resolved Hide resolved
as I'm not sure yet if it's beneficial
@stale
Copy link

stale bot commented Jan 23, 2021

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.

@stale stale bot added the stale Closed for lack of activity, but still valid. label Jan 23, 2021
@actual-nh
Copy link
Contributor

Status?

@stale stale bot removed the stale Closed for lack of activity, but still valid. label Jan 23, 2021
@int-ua
Copy link
Contributor Author

int-ua commented Jan 23, 2021

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.

@int-ua
Copy link
Contributor Author

int-ua commented Jan 23, 2021

Note to self: check if it will set the -dirty flag.

@int-ua int-ua changed the title [CR] Packaged Ultica in a git submodule repository [CR] Infrastructure "Packaged Ultica in a git submodule repository" Jan 24, 2021
$ 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
Copy link
Contributor Author

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.

@int-ua int-ua changed the title [CR] Infrastructure "Packaged Ultica in a git submodule repository" Infrastructure "Packaged Ultica in a git submodule repository" Jan 30, 2021
@int-ua
Copy link
Contributor Author

int-ua commented Jun 17, 2021

This PR can go, I think. I'll leave the branch in case anyone wants to retry :)

@int-ua int-ua closed this Jun 17, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code: Infrastructure / Style / Static Analysis Code internal infrastructure and style SDL: Tiles / Sound Tiles visual interface and sounds.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants