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

Merge branch 'master' into teutat3s

Browse source
This commit is contained in:
teutat3s 2021-09-08 23:36:51 +02:00
parent 916cd67458 8ff750994e
commit 95bb18093c
Signed by untrusted user: teutat3s
GPG key ID: 4FA1D3FA524F22C1
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
.drone.yml
View file

@ -10,9 +10,9 @@ steps:
event: event:
- cron - cron
cron: cron:
- sync-core-with-upstream - sync-master-with-upstream
- sync-b12f-with-core - sync-b12f-with-master
- sync-teutat3s-with-core - sync-teutat3s-with-master
environment: environment:
GITEA_SSH_KEY: GITEA_SSH_KEY:
from_secret: gitea_ssh_key from_secret: gitea_ssh_key
@ -23,7 +23,7 @@ steps:
- git remote add devos git@git.b12f.io:pub-solar/devos - git remote add devos git@git.b12f.io:pub-solar/devos
- 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 merge -X theirs devos/core - git merge -X theirs devos/master
- git push origin devos - git push origin devos
- name: "Sync $BRANCH with upstream" - name: "Sync $BRANCH with upstream"
@ -32,14 +32,14 @@ steps:
event: event:
- cron - cron
cron: cron:
- sync-core-with-upstream - sync-master-with-upstream
- sync-b12f-with-core - sync-b12f-with-master
- sync-teutat3s-with-core - sync-teutat3s-with-master
environment: environment:
GITEA_SSH_KEY: GITEA_SSH_KEY:
from_secret: gitea_ssh_key from_secret: gitea_ssh_key
commands: commands:
- git checkout origin/core - git checkout origin/master
- ./.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
@ -52,16 +52,16 @@ steps:
event: event:
- cron - cron
cron: cron:
- sync-core-with-upstream - sync-master-with-upstream
- sync-b12f-with-core - sync-b12f-with-master
- sync-teutat3s-with-core - sync-teutat3s-with-master
environment: environment:
TEA_CONFIG: TEA_CONFIG:
from_secret: tea_config from_secret: tea_config
commands: commands:
- mkdir -p ~/.config/tea - mkdir -p ~/.config/tea
- echo "$$TEA_CONFIG" > ~/.config/tea/config.yml - echo "$$TEA_CONFIG" > ~/.config/tea/config.yml
- tea pulls create --base core --head devos - tea pulls create --base master --head devos
- name: "Notify matrix" - name: "Notify matrix"
image: plugins/matrix image: plugins/matrix
@ -72,9 +72,9 @@ steps:
event: event:
- cron - cron
cron: cron:
- sync-core-with-upstream - sync-master-with-upstream
- sync-b12f-with-core - sync-b12f-with-master
- sync-teutat3s-with-core - sync-teutat3s-with-master
settings: settings:
homeserver: https://matrix.pub.solar homeserver: https://matrix.pub.solar
roomid: dfQBqwkhIzrFjMSsxy:pub.solar roomid: dfQBqwkhIzrFjMSsxy:pub.solar

2
.drone/upstream-branch.sh
View file

@ -4,7 +4,7 @@ set -e
set -u set -u
LOCAL="$DRONE_BRANCH" LOCAL="$DRONE_BRANCH"
[ "$LOCAL" = "core" ] && UPSTREAM=origin/devos || UPSTREAM=origin/core [ "$LOCAL" = "master" ] && UPSTREAM=origin/devos || UPSTREAM=origin/master
git fetch --all git fetch --all
git checkout "$LOCAL" git checkout "$LOCAL"