pub-solar/os
5
0
Fork 2
Code Issues 4 Pull requests Packages Projects 1 Releases Wiki Activity

drone: fix cron job for upstream syncing #38

Merged
teutat3s merged 1 commit from refs/pull/38/head into main 2021-10-11 21:40:28 +00:00
Conversation 0 Commits 1 Files changed 1 +1
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