fixed builds
This commit is contained in:
parent
13fa04ea9d
commit
ebe7596767
4
Jenkinsfile
vendored
4
Jenkinsfile
vendored
@ -37,7 +37,7 @@ pipeline {
|
||||
/* first of all we have to update our libraries */
|
||||
stage ('libraries::update') {
|
||||
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 './attach_modules.sh'
|
||||
}
|
||||
@ -166,7 +166,7 @@ pipeline {
|
||||
/* first of all we have to update our libraries */
|
||||
stage ('libraries::update') {
|
||||
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 './attach_modules.sh'
|
||||
}
|
||||
|
@ -1,7 +1,11 @@
|
||||
#!/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 :)
|
||||
cd TeaSpeak
|
||||
git submodule update --init --remote --recursive --force
|
||||
git submodule foreach -q --recursive '
|
||||
echo "Updating $name";
|
||||
BRANCH=$(git config -f $toplevel/.gitmodules submodule.$name.branch || echo master)
|
||||
|
Loading…
Reference in New Issue
Block a user