Merge branch 'main' into b12f

This commit is contained in:
Benjamin Bädorf 2021-10-21 19:25:59 +02:00
commit 298f50ba95
No known key found for this signature in database
GPG key ID: 4406E80E13CD656C

View file

@ -39,6 +39,7 @@ steps:
- 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"