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

Drone: follow new upstream default branch main, cron fixes #30

Merged
teutat3s merged 2 commits from refs/pull/30/head into main 2021-10-05 19:32:54 +00:00
Conversation 1 Commits 2 Files changed 2 +20 -5
1 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit a21a13c6fb - Show all commits

25
.drone.yml
View file

@ -4,6 +4,25 @@ 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:
@ -16,11 +35,7 @@ steps:
from_secret: gitea_ssh_key
commands:
- ./.drone/setup_ssh.sh
- git fetch
- git checkout devos
- 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
- git push origin devos