TeaSpeak/Server-Root
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed builds

Browse Source
This commit is contained in:
WolverinDEV 2019-05-28 19:07:55 +02:00
parent 13fa04ea9d
commit ebe7596767
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Jenkinsfile vendored
View File

@ -37,7 +37,7 @@ pipeline {
/* first of all we have to update our libraries */ /* first of all we have to update our libraries */
stage ('libraries::update') { stage ('libraries::update') {
steps { steps {
sh 'git reset --hard origin/master; git submodule update --init --remote --recursive --force' sh 'git reset --hard origin/master;'
sh 'git submodule update --merge' sh 'git submodule update --merge'
sh './attach_modules.sh' sh './attach_modules.sh'
} }
@ -166,7 +166,7 @@ pipeline {
/* first of all we have to update our libraries */ /* first of all we have to update our libraries */
stage ('libraries::update') { stage ('libraries::update') {
steps { steps {
sh 'git reset --hard origin/master; git submodule update --init --remote --recursive --force' sh 'git reset --hard origin/master;'
sh 'git submodule update --merge' sh 'git submodule update --merge'
sh './attach_modules.sh' sh './attach_modules.sh'
} }

4
attach_modules.sh
View File

@ -1,7 +1,11 @@
#!/bin/bash #!/bin/bash
#General modules should be set to their versions
git submodule update --init --recursive --force
#The libs have no need to be attach to the master :) #The libs have no need to be attach to the master :)
cd TeaSpeak cd TeaSpeak
git submodule update --init --remote --recursive --force
git submodule foreach -q --recursive ' git submodule foreach -q --recursive '
echo "Updating $name"; echo "Updating $name";
BRANCH=$(git config -f $toplevel/.gitmodules submodule.$name.branch || echo master) BRANCH=$(git config -f $toplevel/.gitmodules submodule.$name.branch || echo master)