Browse Source

Merge branch 'core' into feat/iso-building

pull/5/head
Benjamin Bädorf 3 months ago
parent
commit
70d6c801de
Signed by: b12f GPG Key ID: 4406E80E13CD656C
  1. 32
      .drone.yml

32
.drone.yml

@ -65,16 +65,13 @@ type: docker
name: Upstreaming
steps:
- name: "Sync upstream to local"
- name: "Sync 'devos' branch with upstream"
image: alpine/git
when:
event:
- cron
- promote
target:
- upstream
branch:
- core
cron:
- sync-core-with-upstream
environment:
GITEA_SSH_KEY:
from_secret: gitea_ssh_key
@ -88,20 +85,20 @@ steps:
- git merge -X theirs devos/core
- git push origin devos
- name: "Sync branch with upstream"
- name: "Sync $BRANCH with upstream"
image: alpine/git
when:
status:
- success
event:
- cron
- promote
target:
- upstream
cron:
- sync-core-with-upstream
environment:
GITEA_SSH_KEY:
from_secret: gitea_ssh_key
commands:
- git checkout core
- ./.drone/setup_ssh.sh
- git remote set-url origin git@git.b12f.io:pub-solar/os
- ./.drone/upstream-branch.sh
@ -113,11 +110,8 @@ steps:
- failure
event:
- cron
- promote
target:
- upstream
branch:
- core
cron:
- sync-core-with-upstream
environment:
TEA_CONFIG:
from_secret: tea_config
@ -134,9 +128,8 @@ steps:
- failure
event:
- cron
- promote
target:
- upstream
cron:
- sync-core-with-upstream
settings:
homeserver: https://matrix.pub.solar
roomid: dfQBqwkhIzrFjMSsxy:pub.solar
@ -259,7 +252,8 @@ steps:
from_secret: matrix_password
template: Publishing latest ISO failed
---
---
kind: signature
hmac: 3b9e4095b675e877da5ccb0258ec38df3d175677ec42c6ab22700a02d3979ecb
hmac: fc39852cff04e2216934b895ac5a2ef5d3d5ffa6ad9b86d11bdab6901e574807
...
Loading…
Cancel
Save