git: branch oops

2021-06-15 00:41:15 +02:00 · 2021-06-15 00:41:15 +02:00 · 3662358706
parent eb39742886
commit 3662358706
1 changed files with 2 additions and 1 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -19,8 +19,9 @@ steps:
        from_secret: gitea_ssh_key
      HOME: /root
    commands:
-      - git clone -b devos https://git.b12f.io/pub-solar/os .
+      - git clone -b feat/upstreaming https://git.b12f.io/pub-solar/os .
      - ./.drone/setup_ssh.sh
+      - git checkout devos
      - git remote add devos git@git.b12f.io:pub-solar/devos
      - git fetch --all
      - git merge -X theirs devos/core