Hopefully git_subs() now correctly pulls the latest from the master branch
This commit is contained in:
parent
2d8f2dc21e
commit
bee53b4e3b
2 changed files with 2 additions and 1 deletions
1
build.sh
1
build.sh
|
|
@ -281,6 +281,7 @@ mach_env() {
|
|||
git_subs() {
|
||||
echo "git_subs: begin."
|
||||
git submodule update --recursive
|
||||
git submodule foreach git pull origin master
|
||||
git submodule foreach git merge origin master
|
||||
echo "git_subs: done."
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/bash
|
||||
|
||||
pkgver=87.0
|
||||
pkgver=88.0
|
||||
private_token=$1
|
||||
if [ -z $private_token ]; then
|
||||
echo "Please specify the Gitlab PRIVATE TOKEN on the commandline."
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue