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:
parent
1f1d24f1e3
commit
84bb1520ee
21
.drone.yml
21
.drone.yml
|
@ -4,25 +4,6 @@ type: docker
|
||||||
name: Upstreaming
|
name: Upstreaming
|
||||||
|
|
||||||
steps:
|
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"
|
- name: "Sync 'devos' branch with upstream"
|
||||||
image: alpine/git
|
image: alpine/git
|
||||||
when:
|
when:
|
||||||
|
@ -35,6 +16,8 @@ steps:
|
||||||
from_secret: gitea_ssh_key
|
from_secret: gitea_ssh_key
|
||||||
commands:
|
commands:
|
||||||
- ./.drone/setup_ssh.sh
|
- ./.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 fetch --all
|
||||||
- git checkout origin/devos
|
- git checkout origin/devos
|
||||||
- git merge -X theirs devos/main
|
- git merge -X theirs devos/main
|
||||||
|
|
Loading…
Reference in a new issue