laksjdlakjsdlakjd

This commit is contained in:
2026-07-16 15:06:56 +02:00
parent c2fd0ecfda
commit 8168a6bdf3
+10 -5
View File
@@ -662,7 +662,7 @@ push-new-pr:
gh pr create --base="$base"
fi
if gum confirm "Enqueue nixpkgs-review?"; then
sleep 10s
sleep 10s # the alternative is to run "gh pr create" non-interactively
pr_number="$(gh pr list --author @me | column -s$'\t' -t | gum choose | cut -d' ' -f1)"
[[ -n "$pr_number" ]]
just enqueue-nixpkgs-review "$pr_number"
@@ -678,7 +678,7 @@ bump-new-worktree *packages:
export JUST_SYSTEM="$(just _a_system)"
gum confirm --default=no "Check versions on all branches?" && just get-versions "${packages[0]}" ||: # TODO: timeout?
#worktree=$(just _new_worktree "$(gum confirm "Use tmp worktree?" && echo tmp-bump || echo bump)" "$(printf "%s\n" "${packages[0]}" | rev | cut -d. -f1 | rev)")
worktree=$(just _new_worktree "bump" "$(printf "%s\n" "${packages[0]}" | rev | cut -d. -f1 | rev)")
worktree=$(just _new_worktree "$(JUST_WT_TYPE="bump" just _a_wt_type)" "$(printf "%s\n" "${packages[0]}" | rev | cut -d. -f1 | rev)")
[[ -n "$worktree" ]]
[[ -d "$worktree" ]]
cd "$worktree"
@@ -710,7 +710,7 @@ bump-here *packages:
for package in "${package_aliases[@]}"; do
if nix eval {{NIX_EVAL_OPTS}} --file default.nix "$package".passthru.updateScript >&/dev/null; then
HEAD=$($GIT rev-parse HEAD)
"${config2[@]}" nix-update "$package" --use-update-script --update-script-args "--argstr skip-prompt true" --commit
"${config2[@]}" nix-update "$package" --use-update-script --update-script-args "--argstr skip-prompt true" --commit || true
if [[ $($GIT rev-parse HEAD) = "$HEAD" ]]; then
echo "no commit found, trying without the updateScript..."
$GIT restore .
@@ -746,7 +746,7 @@ fix *packages:
just open-package-urls "${packages[0]}" ||:
#cd "$(just _new_worktree "$(gum confirm "Use tmp worktree?" && echo tmp-fix || echo fix)" "$(echo "${packages[0]}" | rev | cut -d. -f1 | rev)")"
cd "$(just _new_worktree "fix" "$(echo "${packages[0]}" | rev | cut -d. -f1 | rev)")"
cd "$(just _new_worktree "$(JUST_WT_TYPE="fix" just _a_wt_type)" "$(echo "${packages[0]}" | rev | cut -d. -f1 | rev)")"
just _fix "${packages[@]}" ||:
if gum confirm "Try to bump?" --default=no; then
rm -rf results-src
@@ -882,7 +882,11 @@ checkout-commit-in-worktree $commit=`just _a_commit`:
_a_wt_type:
#!/usr/bin/env -S bash -euo pipefail
#gum choose feat fix init bump doc migrate backport drop tmp tmp-bump tmp-fix tmp-backport
wt_type=$(gum choose feat fix init bump doc migrate backport drop test)
if [[ -z "${JUST_WT_TYPE:-}" ]]; then
wt_type=$(gum choose feat fix init bump doc migrate backport drop test)
else
wt_type="$JUST_WT_TYPE"
fi
if gum confirm "Use tmp worktree?"; then
echo "tmp-$wt_type"
else
@@ -1090,6 +1094,7 @@ _mk_clean_list:
# set -x
(
cd master
git worktree prune # drop stale worktrees
# TODO: assert "upstream" present?
just _list_upstream_release_branches "" | xargs {{XARGS_NL}} $GIT fetch upstream
)