yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request 'merge-after-ci: use nix fmt' (#1823) from kenji/clan-core:feat/merge-after-ci into main

Browse Source 
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/1823
This commit is contained in:
kenji
2024-07-30 11:43:40 +00:00
parent 3cd0feb63c 2eb6a9c404
commit e84a631481
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,7 +10,6 @@ currentBranch="$(git rev-parse --abbrev-ref HEAD)"
user_unparsed="$(tea whoami)" user_unparsed="$(tea whoami)"
user="$(echo "$user_unparsed" | tr -d '\n' | cut -f4 -d' ')" user="$(echo "$user_unparsed" | tr -d '\n' | cut -f4 -d' ')"
tempRemoteBranch="$user-$currentBranch" tempRemoteBranch="$user-$currentBranch"
root_dir=$(git rev-parse --show-toplevel)
# Function to check if a remote exists # Function to check if a remote exists
@@ -30,7 +29,7 @@ if ! check_remote "$remoteUpstream"; then
exit 1 exit 1
fi fi
treefmt --no-cache --fail-on-change -C "$root_dir" nix fmt -- --fail-on-change --no-cache
upstream_url=$(git remote get-url "$remoteUpstream") upstream_url=$(git remote get-url "$remoteUpstream")
set -x set -x
@@ -42,7 +41,7 @@ repo=$(echo "$upstream_url" | sed -E 's#.*:([^/]+/[^.]+)\.git#\1#')
git log --reverse --pretty="format:%s%n%n%b%n%n" "$remoteUpstream/$targetBranch..HEAD" > "$TMPDIR"/commit-msg git log --reverse --pretty="format:%s%n%n%b%n%n" "$remoteUpstream/$targetBranch..HEAD" > "$TMPDIR"/commit-msg
$EDITOR "$TMPDIR"/commit-msg "$EDITOR" "$TMPDIR"/commit-msg
COMMIT_MSG=$(cat "$TMPDIR"/commit-msg) COMMIT_MSG=$(cat "$TMPDIR"/commit-msg)