From 1f1d24f1e3877a47705647f15ec12ecedd2ba69e Mon Sep 17 00:00:00 2001 From: teutat3s Date: Mon, 11 Oct 2021 21:40:27 +0000 Subject: [PATCH] drone: fix cron job for upstream syncing (#38) Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/38 Co-authored-by: teutat3s Co-committed-by: teutat3s --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index 911059a3..62f73181 100644 --- a/.drone.yml +++ b/.drone.yml @@ -35,6 +35,7 @@ steps: from_secret: gitea_ssh_key commands: - ./.drone/setup_ssh.sh + - git fetch --all - git checkout origin/devos - git merge -X theirs devos/main - git push origin devos