diff --git a/.drone.yml b/.drone.yml index 31c4b557..11546d01 100644 --- a/.drone.yml +++ b/.drone.yml @@ -19,11 +19,11 @@ steps: from_secret: gitea_ssh_key commands: - git clone -b feat/upstreaming https://git.b12f.io/pub-solar/os . - - pwd - - ls -al - sh .drone/setup_ssh.sh + - cat ~/.ssh/known_hosts - 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 merge -X theirs devos/core - git push origin devos