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
10 changes: 10 additions & 0 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,16 @@ Helpful pages:
$ git remote add -f upstream https://github.com/CleverRaven/Cataclysm-DDA.git
# Assigns the original repository to a remote called "upstream"

5. (optional) Download the UltimateCataclysm tileset submodule

$ 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.


# Note that it will be in a detached HEAD state
$ git checkout main # from the submodule directory may help with that

For further details about commit message guidelines please visit:
- [codeinthehole.com](https://codeinthehole.com/tips/a-useful-template-for-commit-messages/)
- [chris.beams.io](https://chris.beams.io/posts/git-commit/)
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,13 @@ jobs:
SANITIZE: ${{ matrix.sanitize }}
steps:
- name: checkout repository
uses: actions/checkout@v1
uses: actions/checkout@v2
with:
fetch-depth: 10
submodules: true
- name: download submodules
run: |
git submodule update --init --remote gfx/UltimateCataclysm
- name: install dependencies
run: |
sudo apt-get update
Expand Down
4 changes: 4 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[submodule "gfx/UltimateCataclysm"]
path = gfx/UltimateCataclysm
url = [email protected]:CDDA-Tilesets/UltimateCataclysm.git
branch = main
1 change: 1 addition & 0 deletions gfx/UltimateCataclysm
Submodule UltimateCataclysm added at 4ca43e
Binary file removed gfx/UltimateCataclysm/centered.png
Binary file not shown.
Binary file removed gfx/UltimateCataclysm/fallback.png
Binary file not shown.
Binary file removed gfx/UltimateCataclysm/fillergiant.png
Binary file not shown.
Binary file removed gfx/UltimateCataclysm/fillerhoder.png
Binary file not shown.
Binary file removed gfx/UltimateCataclysm/giant.png
Binary file not shown.
Binary file removed gfx/UltimateCataclysm/huge.png
Binary file not shown.
Binary file removed gfx/UltimateCataclysm/incomplete.png
Binary file not shown.
Binary file removed gfx/UltimateCataclysm/incomplete_large.png
Binary file not shown.
Binary file removed gfx/UltimateCataclysm/incomplete_tall.png
Binary file not shown.
Binary file removed gfx/UltimateCataclysm/large.png
Binary file not shown.
Binary file removed gfx/UltimateCataclysm/normal.png
Binary file not shown.
Binary file removed gfx/UltimateCataclysm/small.png
Binary file not shown.
Binary file removed gfx/UltimateCataclysm/tall.png
Binary file not shown.
Loading