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

b12f-to-master (#16)

Browse source 
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/16
Co-authored-by: teutat3s <teutates@mailbox.org>
Co-committed-by: teutat3s <teutates@mailbox.org>
This commit is contained in:
teutat3s 2021-09-08 22:00:03 +00:00 committed by Benjamin Bädorf
parent 3dcc90fc24
commit 761b671549
4 changed files with 18 additions and 18 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"

2
modules/social/default.nix
View file

@ -15,7 +15,7 @@ in
#mySignalDesktop #mySignalDesktop
signal-desktop signal-desktop
tdesktop tdesktop
element-desktop element-desktop-wayland
irssi irssi
]; ];
}; };

2
overlays/overrides.nix
View file

@ -6,7 +6,7 @@ channels: final: prev: {
cachix cachix
dhall dhall
discord discord
element-desktop element-desktop-wayland
rage rage
docker-compose docker-compose
neovim-unwrapped neovim-unwrapped