b12f/os
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

drone: fix git fetch for main, too (#49)

Browse source 
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/49
Co-authored-by: teutat3s <teutates@mailbox.org>
Co-committed-by: teutat3s <teutates@mailbox.org>
This commit is contained in:
teutat3s 2021-10-20 07:52:46 +00:00
parent 36c6fdd254
commit fc037d9833
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.drone.yml
View file

@ -36,10 +36,10 @@ steps:
GITEA_SSH_KEY: GITEA_SSH_KEY:
from_secret: gitea_ssh_key from_secret: gitea_ssh_key
commands: commands:
- 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
- git fetch --all - git fetch --all
- git checkout origin/main
- ./.drone/upstream-branch.sh - ./.drone/upstream-branch.sh
- name: "Open pull request for failed merge" - name: "Open pull request for failed merge"