From c270f85076245ec24f1d2e9b41f97aa5c68fb060 Mon Sep 17 00:00:00 2001 From: teutat3s Date: Tue, 15 Jun 2021 00:49:52 +0200 Subject: [PATCH] debug --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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