[ci] fix ws in patches and use git apply
This commit is contained in:
parent
6f8d6d5b3a
commit
88cfc4bc67
|
@ -25,7 +25,7 @@ else
|
|||
cd "/tmp/${PUBLISH}"
|
||||
|
||||
echo_headline "Patching"
|
||||
git am < "/tmp/${PUBLISH}.patch"
|
||||
git apply --reject --whitespace=fix "/tmp/${PUBLISH}.patch"
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "Failed to apply \"/tmp/${PUBLISH}.patch\"."
|
||||
exit 2
|
||||
|
|
|
@ -10,6 +10,8 @@
|
|||
##
|
||||
## License: GPLv3
|
||||
|
||||
cd "/tmp/${PUBLISH}"
|
||||
|
||||
export GITHUB_TOKEN=$UPD_BOT_GIT_TK
|
||||
echo_headline "Opening PR to ${UPD_BOT_LOGIN}/${UPD_BOT_REPO} repo"
|
||||
echo "[bot] Built-in auto-update" > msg
|
||||
|
|
|
@ -10,6 +10,8 @@
|
|||
##
|
||||
## License: GPLv3
|
||||
|
||||
cd "/tmp/${PUBLISH}"
|
||||
|
||||
export GITHUB_TOKEN=$UPD_BOT_GIT_TK
|
||||
echo_headline "Opening PR to ${UPD_BOT_LOGIN}/${UPD_BOT_REPO} repo"
|
||||
echo "[bot] Documentation fixes" > msg
|
||||
|
|
|
@ -10,6 +10,8 @@
|
|||
##
|
||||
## License: GPLv3
|
||||
|
||||
cd "/tmp/${PUBLISH}"
|
||||
|
||||
echo_headline "Creating fork under bot account"
|
||||
export GITHUB_TOKEN=$UPD_BOT_GIT_TK
|
||||
git checkout -b "${PUBLISH}"
|
||||
|
|
Loading…
Reference in New Issue