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