From bdb513246074731dd1550f4284108c932390e748 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20B=C3=A4dorf?= Date: Thu, 21 Oct 2021 17:39:38 +0000 Subject: [PATCH] Fetch repos before upstream merge, so we have access to main (#51) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Benjamin Bädorf Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/51 Reviewed-by: teutat3s Co-authored-by: Benjamin Bädorf Co-committed-by: Benjamin Bädorf --- .drone.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 6f18103c..89514d6c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -36,6 +36,7 @@ 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 @@ -83,6 +84,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: f88330a68ced90f4c242aedcbec9359fa63f00c47db6707e2646546daa4a9109 +hmac: 145dff5d1aac21f4c68f186cc2dbd98ccb8f08f23af8df3528de6a21defee1c7 ...