From c44338ec84bbbbf43b175ccab2b569ab37313d95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 22 Aug 2023 13:20:16 +0200 Subject: [PATCH] merge-after-ci: just inline script --- pkgs/merge-after-ci/default.nix | 5 ++++- pkgs/merge-after-ci/script.sh | 7 ------- 2 files changed, 4 insertions(+), 8 deletions(-) delete mode 100644 pkgs/merge-after-ci/script.sh diff --git a/pkgs/merge-after-ci/default.nix b/pkgs/merge-after-ci/default.nix index 46dc0627..efe53267 100644 --- a/pkgs/merge-after-ci/default.nix +++ b/pkgs/merge-after-ci/default.nix @@ -18,6 +18,9 @@ writeShellApplication { tea-create-pr ]; text = '' - bash ${./script.sh} "$@" + remoteName="''${1:-origin}" + targetBranch="''${2:-main}" + shift && shift + tea-create-pr "$remoteName" "$targetBranch" --assignees clan-bot "$@" ''; } diff --git a/pkgs/merge-after-ci/script.sh b/pkgs/merge-after-ci/script.sh deleted file mode 100644 index 2373c426..00000000 --- a/pkgs/merge-after-ci/script.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash -set -euo pipefail - -remoteName="${1:-origin}" -targetBranch="${2:-main}" -shift && shift -tea-create-pr "$remoteName" "$targetBranch" --assignees clan-bot "$@"