Merge branch 'main' into teutat3s

This commit is contained in:
teutat3s 2021-10-26 10:28:20 +02:00
commit 81647c8447
Signed by: teutat3s
GPG key ID: 4FA1D3FA524F22C1

View file

@ -37,7 +37,7 @@ steps:
GITEA_SSH_KEY: GITEA_SSH_KEY:
from_secret: gitea_ssh_key from_secret: gitea_ssh_key
commands: commands:
- git fetch --all - git fetch origin
- 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
@ -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)" 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 kind: signature
hmac: a70d222a8aeff1cf3436d627353908cf7657a0dda1e86f6348458de9ca214d31 hmac: 07d9a95e8f577483d753e9eea76229ffe0c369ecd642bfc364ae183f662d2167
... ...