diff --git a/.drone.yml b/.drone.yml index c2067648..926670fd 100644 --- a/.drone.yml +++ b/.drone.yml @@ -45,10 +45,10 @@ steps: - echo "Host git.b12f.io" >> ~/.ssh/config - echo " Port 2222" >> ~/.ssh/config - chmod -R 600 ~/.ssh - - git clone -b core git@git.b12f.io:pub-solar/os - cd os - - git fetch - - git merge devos + - git fetch --all + - git checkout origin/core + - git merge origin/devos - git push origin core - name: "Notify success"