From c3f903f2ec0ec8a024357b314481676d233da496 Mon Sep 17 00:00:00 2001 From: amtoine Date: Wed, 6 Mar 2024 22:35:58 +0100 Subject: [PATCH 1/4] bump Nushell and Nupm --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 71a1bc6d..880f77da 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,10 +13,10 @@ jobs: tests: uses: ./.github/workflows/nupm-tests.yml with: - nu_version: "0.90.1" - nupm_revision: "66e2eaa848e3f72c1b4a841f26f4dc7efc4fedb9" + nu_version: "0.91.0" + nupm_revision: "29916fc43aad40ffe901b3c0be8820b9cb78fdba" documentation: uses: ./.github/workflows/check-documentation.yml with: - nu_version: "0.90.1" + nu_version: "0.91.0" From 3fb4773eaad5690cb9899870058ef17acfa52bb6 Mon Sep 17 00:00:00 2001 From: amtoine Date: Wed, 6 Mar 2024 22:20:15 +0100 Subject: [PATCH 2/4] fix in the toolkit --- toolkit.nu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit.nu b/toolkit.nu index 09562fc4..2ba2470b 100644 --- a/toolkit.nu +++ b/toolkit.nu @@ -194,7 +194,7 @@ def run-nu [code: string]: nothing -> any { } def rg [root: path, pattern: string]: nothing -> table { - ls ($root | path join "**" "*") + ls ($root | path join "**" "*" | into glob) | where type == file | get name | wrap file From 8849b9f5b308b7a391faf2d96d6aee7ce80e950f Mon Sep 17 00:00:00 2001 From: amtoine Date: Wed, 6 Mar 2024 22:21:53 +0100 Subject: [PATCH 3/4] fix all globs --- pkgs/nu-git-manager/nu-git-manager/mod.nu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/nu-git-manager/nu-git-manager/mod.nu b/pkgs/nu-git-manager/nu-git-manager/mod.nu index 12fecb3a..d67dcb3e 100644 --- a/pkgs/nu-git-manager/nu-git-manager/mod.nu +++ b/pkgs/nu-git-manager/nu-git-manager/mod.nu @@ -567,7 +567,7 @@ export def "gm squash-forks" [ export def "gm clean" [ --list # only list without cleaning ]: nothing -> list { - let empty_directories_in_store = ls (gm status | get root.path | path join "**") + let empty_directories_in_store = ls (gm status | get root.path | path join "**" | into glob) | where (ls $it.name | is-empty) | get name | path expand From c7d50ec3cefdb49c56c8daafef5a28af26e31eea Mon Sep 17 00:00:00 2001 From: amtoine Date: Wed, 6 Mar 2024 22:52:11 +0100 Subject: [PATCH 4/4] fix the spreading of arguments to externals --- pkgs/nu-git-manager-sugar/tests/git.nu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/nu-git-manager-sugar/tests/git.nu b/pkgs/nu-git-manager-sugar/tests/git.nu index fbd1f552..e960d1ff 100644 --- a/pkgs/nu-git-manager-sugar/tests/git.nu +++ b/pkgs/nu-git-manager-sugar/tests/git.nu @@ -125,7 +125,7 @@ export def remote-list [] { } def "assert simple-git-tree-equal" [expected: list, --extra-revs: list = []] { - let actual = ^git log --oneline --decorate --graph --all $extra_revs + let actual = ^git log --oneline --decorate --graph --all ...$extra_revs | lines | parse "* {hash} {tree}" | get tree