Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-get-submodule-on-build' into 'master'

Browse Source 
Fix get submodule on build

See merge request veloren/veloren!86

Former-commit-id: b7f6b4ffb3470e7c82f36b506723b3541018d1cd
This commit is contained in:
Forest Anderson 2019-04-29 02:23:33 +00:00
commit 36360e9391
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -28,7 +28,7 @@ before_script:
git pull "https://gitlab.com/${SOURCE_PROJECT}/veloren.git" "${SOURCE_BRANCH}"; git pull "https://gitlab.com/${SOURCE_PROJECT}/veloren.git" "${SOURCE_BRANCH}";
fi; fi;
- git submodule sync --recursive - git submodule sync --recursive
- git submodule update --remote --recursive - git submodule update --init --recursive --depth 20
- git status - git status
- if [ -d target ]; then - if [ -d target ]; then
ls -la target; ls -la target;

2
.gitmodules vendored
View File

@ -1,4 +1,4 @@
[submodule "assets/voxygen"] [submodule "assets/voxygen"]
path = assets/voxygen path = assets/voxygen
url = https://gitlab.com/veloren/fresh-assets/voxygen.git url = ../../veloren/fresh-assets/voxygen.git
shallow = true shallow = true