Do clone ourselves instead of drone

This commit is contained in:
Benjamin Bädorf 2021-06-15 00:20:42 +02:00
parent 2b01119f1f
commit e67ce93376
No known key found for this signature in database
GPG key ID: 4406E80E13CD656C
2 changed files with 5 additions and 4 deletions

View file

@ -1,6 +1,9 @@
kind: pipeline
type: docker
name: api
name: upstreaming
clone:
disable: true
steps:
- name: "Sync upstream to local"
@ -24,8 +27,7 @@ steps:
- echo "Host git.b12f.io" >> ~/.ssh/config
- echo " Port 2222" >> ~/.ssh/config
- chmod -R 600 ~/.ssh
- git clone -b devos git@git.b12f.io:pub-solar/os
- cd os
- git clone -b devos git@git.b12f.io:pub-solar/os .
- git remote add devos git@git.b12f.io:pub-solar/devos
- git fetch --all
- git merge -X theirs devos/core
@ -56,7 +58,6 @@ steps:
- echo "Host git.b12f.io" >> ~/.ssh/config
- echo " Port 2222" >> ~/.ssh/config
- chmod -R 600 ~/.ssh
- cd os
- git fetch --all
- git checkout --track origin/core
- git merge origin/devos