Merge branch 'main' into teutat3s

This commit is contained in:
teutat3s 2021-10-20 10:03:23 +02:00
commit 7d9d924f2b
Signed by untrusted user: teutat3s
GPG key ID: 4FA1D3FA524F22C1

View file

@ -36,10 +36,10 @@ steps:
GITEA_SSH_KEY:
from_secret: gitea_ssh_key
commands:
- git fetch --all
- 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"