IoSL/service-aware-frontend
3
0
Fork 0
generated from Luis/nextjs-python-web-template
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing merge-after-ci

Browse Source
This commit is contained in:
Luis
2023-10-23 02:12:42 +02:00
parent f1b66d7996
commit 9238225556
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/clan-cli/.envrc
View File

@@ -1,3 +1,4 @@
#!/usr/bin/env bash
# Because we depend on nixpkgs sources, uploading to builders takes a long time # Because we depend on nixpkgs sources, uploading to builders takes a long time
source_up source_up

2
pkgs/merge-after-ci/default.nix
View File

@@ -21,6 +21,6 @@ writeShellApplication {
remoteName="''${1:-origin}" remoteName="''${1:-origin}"
targetBranch="''${2:-main}" targetBranch="''${2:-main}"
shift && shift shift && shift
tea-create-pr "$remoteName" "$targetBranch" --assignees clan-bot "$@" tea-create-pr "$remoteName" "$targetBranch" --assignees consulting-bot "$@"
''; '';
} }

2
pkgs/tea-create-pr/script.sh
View File

@@ -6,7 +6,7 @@ targetBranch="${2:-main}"
shift && shift shift && shift
TMPDIR="$(mktemp -d)" TMPDIR="$(mktemp -d)"
currentBranch="$(git rev-parse --abbrev-ref HEAD)" currentBranch="$(git rev-parse --abbrev-ref HEAD)"
user="$(tea login list -o simple | cut -d" " -f4)" user="$(git config --get user.name)"
tempRemoteBranch="$user-$currentBranch" tempRemoteBranch="$user-$currentBranch"
nix fmt -- --fail-on-change nix fmt -- --fail-on-change