From dc094536175ac85c48dc27092f3babb4879d44c2 Mon Sep 17 00:00:00 2001 From: DavHau Date: Fri, 28 Jul 2023 15:03:06 +0200 Subject: [PATCH] merge-after-ci: init --- flake-parts/devShells/default.nix | 23 +++++++++++---------- flake-parts/merge-after-ci/default.nix | 28 ++++++++++++++++++++++++++ flake-parts/merge-after-ci/script.sh | 7 +++++++ flake.nix | 1 + 4 files changed, 48 insertions(+), 11 deletions(-) create mode 100644 flake-parts/merge-after-ci/default.nix create mode 100644 flake-parts/merge-after-ci/script.sh diff --git a/flake-parts/devShells/default.nix b/flake-parts/devShells/default.nix index fca22b4a..445cf2e6 100644 --- a/flake-parts/devShells/default.nix +++ b/flake-parts/devShells/default.nix @@ -1,14 +1,15 @@ { - perSystem = { - lib, - pkgs, - self', - ... - }: { - devShells.default = pkgs.mkShell { - packages = [ - pkgs.tea - self'.packages.tea-create-pr - ]; + perSystem = + { pkgs + , self' + , ... + }: { + devShells.default = pkgs.mkShell { + packages = [ + pkgs.tea + self'.packages.tea-create-pr + self'.packages.merge-after-ci + ]; + }; }; } diff --git a/flake-parts/merge-after-ci/default.nix b/flake-parts/merge-after-ci/default.nix new file mode 100644 index 00000000..0c8d8a5e --- /dev/null +++ b/flake-parts/merge-after-ci/default.nix @@ -0,0 +1,28 @@ +{ + perSystem = + { config + , pkgs + , self' + , ... + }: + let + name = builtins.baseNameOf ./.; + script = config.writers.writePureShellScriptBin + name + [ + pkgs.bash + pkgs.coreutils + pkgs.git + pkgs.tea + pkgs.openssh + self'.packages.tea-create-pr + ] + '' + export EDITOR=${pkgs.vim}/bin/vim + bash ${./script.sh} "$@" + ''; + in + { + packages.${name} = script; + }; +} diff --git a/flake-parts/merge-after-ci/script.sh b/flake-parts/merge-after-ci/script.sh new file mode 100644 index 00000000..2373c426 --- /dev/null +++ b/flake-parts/merge-after-ci/script.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash +set -euo pipefail + +remoteName="${1:-origin}" +targetBranch="${2:-main}" +shift && shift +tea-create-pr "$remoteName" "$targetBranch" --assignees clan-bot "$@" diff --git a/flake.nix b/flake.nix index d92345ec..2644215f 100644 --- a/flake.nix +++ b/flake.nix @@ -20,6 +20,7 @@ imports = [ ./flake-parts/devShells ./flake-parts/formatting.nix + ./flake-parts/merge-after-ci ./flake-parts/modules.nix ./flake-parts/packages.nix ./flake-parts/tea-create-pr