Merge branch 'main' into b12f
This commit is contained in:
commit
298f50ba95
|
@ -39,6 +39,7 @@ steps:
|
|||
- git checkout origin/main
|
||||
- ./.drone/setup_ssh.sh
|
||||
- git remote set-url origin git@git.b12f.io:pub-solar/os
|
||||
- git fetch --all
|
||||
- ./.drone/upstream-branch.sh
|
||||
|
||||
- name: "Open pull request for failed merge"
|
||||
|
|
Loading…
Reference in a new issue