axeman/pub-solar-os
1
0
Fork 0
forked from pub-solar/os
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into b12f

Browse source
This commit is contained in:
Benjamin Bädorf 2021-10-25 00:07:45 +00:00
parent d064b27393 6475e7563f
commit 0015849858
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

@ -22,6 +22,7 @@ steps:
- git checkout -b devos --track origin/devos - git checkout -b devos --track origin/devos
- git merge -X theirs devos/main - git merge -X theirs devos/main
- git push origin devos - git push origin devos
- git remote set-url origin https://git.b12f.io/pub-solar/os.git
- name: "Sync $BRANCH with upstream" - name: "Sync $BRANCH with upstream"
image: alpine/git image: alpine/git