pub-solar/os
5
0
Fork 2
Code Issues 4 Pull requests Packages Projects 1 Releases Wiki Activity

drone: fix git fetch for main, too #48

Merged
teutat3s merged 1 commit from refs/pull/48/head into main 2021-10-20 07:47:13 +00:00
Conversation 0 Commits 1 Files changed 1 +2 -2
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 525765aea4 - Show all commits

4
.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 fetch --all
- 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 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"