Follow upstream master branch, it's their new default (#14)
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/14 Co-authored-by: teutat3s <teutates@mailbox.org> Co-committed-by: teutat3s <teutates@mailbox.org>
This commit is contained in:
parent
02330bc9ce
commit
efc58fba0a
30
.drone.yml
30
.drone.yml
|
@ -10,9 +10,9 @@ steps:
|
|||
event:
|
||||
- cron
|
||||
cron:
|
||||
- sync-core-with-upstream
|
||||
- sync-b12f-with-core
|
||||
- sync-teutat3s-with-core
|
||||
- sync-master-with-upstream
|
||||
- sync-b12f-with-master
|
||||
- sync-teutat3s-with-master
|
||||
environment:
|
||||
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 set-url origin git@git.b12f.io:pub-solar/os
|
||||
- git fetch --all
|
||||
- git merge -X theirs devos/core
|
||||
- git merge -X theirs devos/master
|
||||
- git push origin devos
|
||||
|
||||
- name: "Sync $BRANCH with upstream"
|
||||
|
@ -32,14 +32,14 @@ steps:
|
|||
event:
|
||||
- cron
|
||||
cron:
|
||||
- sync-core-with-upstream
|
||||
- sync-b12f-with-core
|
||||
- sync-teutat3s-with-core
|
||||
- sync-master-with-upstream
|
||||
- sync-b12f-with-master
|
||||
- sync-teutat3s-with-master
|
||||
environment:
|
||||
GITEA_SSH_KEY:
|
||||
from_secret: gitea_ssh_key
|
||||
commands:
|
||||
- git checkout origin/core
|
||||
- git checkout origin/master
|
||||
- ./.drone/setup_ssh.sh
|
||||
- git remote set-url origin git@git.b12f.io:pub-solar/os
|
||||
- ./.drone/upstream-branch.sh
|
||||
|
@ -52,16 +52,16 @@ steps:
|
|||
event:
|
||||
- cron
|
||||
cron:
|
||||
- sync-core-with-upstream
|
||||
- sync-b12f-with-core
|
||||
- sync-teutat3s-with-core
|
||||
- sync-master-with-upstream
|
||||
- sync-b12f-with-master
|
||||
- sync-teutat3s-with-master
|
||||
environment:
|
||||
TEA_CONFIG:
|
||||
from_secret: tea_config
|
||||
commands:
|
||||
- mkdir -p ~/.config/tea
|
||||
- echo "$$TEA_CONFIG" > ~/.config/tea/config.yml
|
||||
- tea pulls create --base core --head devos
|
||||
- tea pulls create --base master --head devos
|
||||
|
||||
- name: "Notify matrix"
|
||||
image: plugins/matrix
|
||||
|
@ -72,9 +72,9 @@ steps:
|
|||
event:
|
||||
- cron
|
||||
cron:
|
||||
- sync-core-with-upstream
|
||||
- sync-b12f-with-core
|
||||
- sync-teutat3s-with-core
|
||||
- sync-master-with-upstream
|
||||
- sync-b12f-with-master
|
||||
- sync-teutat3s-with-master
|
||||
settings:
|
||||
homeserver: https://matrix.pub.solar
|
||||
roomid: dfQBqwkhIzrFjMSsxy:pub.solar
|
||||
|
|
|
@ -4,7 +4,7 @@ set -e
|
|||
set -u
|
||||
|
||||
LOCAL="$DRONE_BRANCH"
|
||||
[ "$LOCAL" = "core" ] && UPSTREAM=origin/devos || UPSTREAM=origin/core
|
||||
[ "$LOCAL" = "master" ] && UPSTREAM=origin/devos || UPSTREAM=origin/master
|
||||
|
||||
git fetch --all
|
||||
git checkout "$LOCAL"
|
||||
|
|
Loading…
Reference in a new issue