axeman/pub-solar-os
1
0
Fork 0
forked from pub-solar/os
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix starting step on wrong branch, step names

Browse source
This commit is contained in:
teutat3s 2021-06-27 17:23:18 +02:00
parent 75e994e853
commit 1ecdf060b9
Signed by untrusted user: teutat3s
GPG key ID: 4FA1D3FA524F22C1
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.drone.yml
View file

@ -4,7 +4,7 @@ type: docker
name: Upstreaming name: Upstreaming
steps: steps:
- name: "Sync upstream to local" - name: "Sync 'devos' branch with upstream"
image: alpine/git image: alpine/git
when: when:
event: event:
@ -27,7 +27,7 @@ steps:
- git merge -X theirs devos/core - git merge -X theirs devos/core
- git push origin devos - git push origin devos
- name: "Sync branch with upstream" - name: "Sync $BRANCH with upstream"
image: alpine/git image: alpine/git
when: when:
status: status:
@ -41,6 +41,7 @@ steps:
GITEA_SSH_KEY: GITEA_SSH_KEY:
from_secret: gitea_ssh_key from_secret: gitea_ssh_key
commands: commands:
- git checkout core
- ./.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
- ./.drone/upstream-branch.sh - ./.drone/upstream-branch.sh
@ -86,6 +87,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)" 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 kind: signature
hmac: 3a3f8dbb835b0b4cbdb4d25cc119d5032612ce05604e919b3a079e56f81bfeb4 hmac: 7a1c018c4c2e7b5d81ebd0bdfbbe5783f99156c2e9f1499402e764f7faf8427b
... ...