danog/MadelineProto
2
2
Fork 0
Code Issues Pull Requests Releases Wiki Activity

try avoiding conflict

Browse Source
This commit is contained in:
Daniil Gentili 2019-09-04 19:17:16 +02:00
parent 5c104180f0
commit b9f036681a
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs

@ -1 +1 @@
Subproject commit fe346258733323e5173e674f15059dea1a1eb880 Subproject commit 9a873608310b43395032755c35bbdf17d35e23d7

7
tests/makephar.sh
View File

@ -128,14 +128,11 @@ echo "$TRAVIS_COMMIT_MESSAGE" | grep -i "subrelease" && {
cp release$php$branch release$php cp release$php$branch release$php
cp madeline$php$branch.phar madeline$php.phar cp madeline$php$branch.phar madeline$php.phar
} }
while [ "$(cat release$branch)" != "$TRAVIS_COMMIT" ]; do sleep 1; git pull;done
while [ "$(cat release70$branch)" != "$TRAVIS_COMMIT" ]; do sleep 1; git pull;done
while [ "$(cat release5$branch)" != "$TRAVIS_COMMIT" ]; do sleep 1; git pull;done
git add -A git add -A
git commit -am "Release $TRAVIS_BRANCH - $TRAVIS_COMMIT_MESSAGE" git commit -am "Release $TRAVIS_BRANCH - $TRAVIS_COMMIT_MESSAGE"
git push origin master until git push origin master; do git pull origin master; done
cd .. cd ..
echo "$TRAVIS_COMMIT_MESSAGE" | grep "Apply fixes from StyleCI" && exit echo "$TRAVIS_COMMIT_MESSAGE" | grep "Apply fixes from StyleCI" && exit