Merge remote-tracking branch 'origin/main' into b12f

This commit is contained in:
Benjamin Bädorf 2021-10-26 00:07:47 +00:00
commit 2724982a4f

View file

@ -37,7 +37,7 @@ steps:
GITEA_SSH_KEY:
from_secret: gitea_ssh_key
commands:
- git fetch --all
- git fetch origin
- git checkout origin/main
- ./.drone/setup_ssh.sh
- git remote set-url origin git@git.b12f.io:pub-solar/os
@ -85,6 +85,6 @@ steps:
template: "Upstreaming {{ build.status }} [{{ build.branch }}#{{ truncate build.commit 8 }}]({{ build.link }}) by {{ build.author }}. [Pull requests](https://git.b12f.io/pub-solar/os/pulls)"
---
kind: signature
hmac: 145dff5d1aac21f4c68f186cc2dbd98ccb8f08f23af8df3528de6a21defee1c7
hmac: 07d9a95e8f577483d753e9eea76229ffe0c369ecd642bfc364ae183f662d2167
...