librewolf-bot/windows
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Hopefully git_subs() now correctly pulls the latest from the master branch

Browse source
This commit is contained in:
Bert van der Weerd 2021-04-20 16:10:50 +02:00
parent 2d8f2dc21e
commit bee53b4e3b
No known key found for this signature in database
GPG key ID: 4CFABB96ADE0F5B1
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
build.sh
View file

@ -281,6 +281,7 @@ mach_env() {
git_subs() { git_subs() {
echo "git_subs: begin." echo "git_subs: begin."
git submodule update --recursive git submodule update --recursive
git submodule foreach git pull origin master
git submodule foreach git merge origin master git submodule foreach git merge origin master
echo "git_subs: done." echo "git_subs: done."
} }

2
util/upload-distfiles.sh
View file

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
pkgver=87.0 pkgver=88.0
private_token=$1 private_token=$1
if [ -z $private_token ]; then if [ -z $private_token ]; then
echo "Please specify the Gitlab PRIVATE TOKEN on the commandline." echo "Please specify the Gitlab PRIVATE TOKEN on the commandline."