fix/drone-upstream-cron (#39)

Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/39
Co-authored-by: teutat3s <teutates@mailbox.org>
Co-committed-by: teutat3s <teutates@mailbox.org>
This commit is contained in:
teutat3s 2021-10-11 21:47:46 +00:00
parent 1f1d24f1e3
commit 84bb1520ee

View file

@ -4,25 +4,6 @@ type: docker
name: Upstreaming
steps:
- name: "Setup git repos and SSH access"
image: alpine/git
when:
event:
- cron
cron:
- sync-main-with-upstream
- sync-b12f-with-main
- sync-teutat3s-with-main
environment:
GITEA_SSH_KEY:
from_secret: gitea_ssh_key
commands:
- ./.drone/setup_ssh.sh
- git fetch
- git remote add devos git@git.b12f.io:pub-solar/devos
- git remote set-url origin git@git.b12f.io:pub-solar/os
- git fetch --all
- name: "Sync 'devos' branch with upstream"
image: alpine/git
when:
@ -35,6 +16,8 @@ steps:
from_secret: gitea_ssh_key
commands:
- ./.drone/setup_ssh.sh
- git remote add devos git@git.b12f.io:pub-solar/devos
- git remote set-url origin git@git.b12f.io:pub-solar/os
- git fetch --all
- git checkout origin/devos
- git merge -X theirs devos/main