From 761b671549bf8d332c7f09f73d68cef8c4d35c20 Mon Sep 17 00:00:00 2001 From: teutat3s Date: Wed, 8 Sep 2021 22:00:03 +0000 Subject: [PATCH] b12f-to-master (#16) Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/16 Co-authored-by: teutat3s Co-committed-by: teutat3s --- .drone.yml | 30 +++++++++++++++--------------- .drone/upstream-branch.sh | 2 +- modules/social/default.nix | 2 +- overlays/overrides.nix | 2 +- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.drone.yml b/.drone.yml index 20a51482..c1de7237 100644 --- a/.drone.yml +++ b/.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 diff --git a/.drone/upstream-branch.sh b/.drone/upstream-branch.sh index cda81336..a0cda64e 100755 --- a/.drone/upstream-branch.sh +++ b/.drone/upstream-branch.sh @@ -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" diff --git a/modules/social/default.nix b/modules/social/default.nix index f3aa63b7..90a23c3e 100644 --- a/modules/social/default.nix +++ b/modules/social/default.nix @@ -15,7 +15,7 @@ in #mySignalDesktop signal-desktop tdesktop - element-desktop + element-desktop-wayland irssi ]; }; diff --git a/overlays/overrides.nix b/overlays/overrides.nix index 06aa5247..dba9a016 100644 --- a/overlays/overrides.nix +++ b/overlays/overrides.nix @@ -6,7 +6,7 @@ channels: final: prev: { cachix dhall discord - element-desktop + element-desktop-wayland rage docker-compose neovim-unwrapped