From 95f5430b2b7921fe68eb4cc538decb1305d03a89 Mon Sep 17 00:00:00 2001 From: teutat3s Date: Wed, 13 Oct 2021 22:08:30 +0000 Subject: [PATCH 1/3] drone: git fetch before doing git checkout (#46) Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/46 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 85891705..f9b3d07d 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 From 36c6fdd2548799a4095e4beff95f80e51c215ea3 Mon Sep 17 00:00:00 2001 From: teutat3s Date: Wed, 20 Oct 2021 07:47:12 +0000 Subject: [PATCH 2/3] drone: fix git fetch for main, too (#48) Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/48 Co-authored-by: teutat3s Co-committed-by: teutat3s --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index f9b3d07d..2a2fcf97 100644 --- a/.drone.yml +++ b/.drone.yml @@ -36,10 +36,10 @@ 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 + - git fetch --all + - git checkout origin/main - ./.drone/upstream-branch.sh - name: "Open pull request for failed merge" From fc037d9833afed68d943a04dd7012df92d96b166 Mon Sep 17 00:00:00 2001 From: teutat3s Date: Wed, 20 Oct 2021 07:52:46 +0000 Subject: [PATCH 3/3] drone: fix git fetch for main, too (#49) Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/49 Co-authored-by: teutat3s Co-committed-by: teutat3s --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 2a2fcf97..6f18103c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -36,10 +36,10 @@ steps: GITEA_SSH_KEY: from_secret: gitea_ssh_key commands: + - git checkout origin/main - ./.drone/setup_ssh.sh - git remote set-url origin git@git.b12f.io:pub-solar/os - git fetch --all - - git checkout origin/main - ./.drone/upstream-branch.sh - name: "Open pull request for failed merge"