teutat3s/os
2
0
Fork 0
forked from pub-solar/os
Code Pull requests Activity

drone: fix cron job for upstream syncing (#38)

Browse source 
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:
teutat3s 2021-10-11 21:40:27 +00:00
parent 038420caed
commit 1f1d24f1e3
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.drone.yml
View file

@ -35,6 +35,7 @@ steps:
from_secret: gitea_ssh_key from_secret: gitea_ssh_key
commands: commands:
- ./.drone/setup_ssh.sh - ./.drone/setup_ssh.sh
- git fetch --all
- git checkout origin/devos - git checkout origin/devos
- git merge -X theirs devos/main - git merge -X theirs devos/main
- git push origin devos - git push origin devos