drone: fix cron job for upstream syncing (#38)
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/38 Co-authored-by: teutat3s <teutates@mailbox.org> Co-committed-by: teutat3s <teutates@mailbox.org>
This commit is contained in:
parent
038420caed
commit
1f1d24f1e3
|
@ -35,6 +35,7 @@ steps:
|
|||
from_secret: gitea_ssh_key
|
||||
commands:
|
||||
- ./.drone/setup_ssh.sh
|
||||
- git fetch --all
|
||||
- git checkout origin/devos
|
||||
- git merge -X theirs devos/main
|
||||
- git push origin devos
|
||||
|
|
Loading…
Reference in a new issue