diff --git a/.github/workflows/loong.yml b/.github/workflows/loong.yml index a83f2c5de..61b0a4b00 100644 --- a/.github/workflows/loong.yml +++ b/.github/workflows/loong.yml @@ -39,7 +39,7 @@ jobs: platforms: all - name: Checkout - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Test Install Nushell on Loong64 run: | docker pull --platform=linux/loong64 ${{ matrix.image }} @@ -81,7 +81,7 @@ jobs: platforms: all - name: Checkout - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Test Install Nushell on Loong64 run: | docker pull --platform=linux/loong64 ${{ matrix.image }} diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index d6184dbb6..3d107455e 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -25,7 +25,7 @@ jobs: name: Build Nu Pkgs@${{ matrix.os }} steps: - name: Checkout - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Setup Nushell uses: hustcer/setup-nu@v3 @@ -69,7 +69,7 @@ jobs: name: Build Nu Pkgs for Other ARCHs steps: - name: Checkout - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Setup Nushell uses: hustcer/setup-nu@v3 @@ -108,7 +108,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Setup Nushell uses: hustcer/setup-nu@v3 - name: Calc Tag and Upload Source Archive diff --git a/.github/workflows/test-msi.yml b/.github/workflows/test-msi.yml index 4e9c0e664..a50109ce7 100644 --- a/.github/workflows/test-msi.yml +++ b/.github/workflows/test-msi.yml @@ -38,12 +38,14 @@ jobs: runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@v7 - name: Checkout Nutest Repo - uses: actions/checkout@v6 + uses: actions/checkout@v7 with: - ref: v1.1.0 + # Includes the updated `returns.results` type annotation needed by + # recent Nushell nightlies. + ref: 097ca6839c861f3f9b7d8b702e92d712b621b8dd path: nutest repository: vyadh/nutest sparse-checkout: nutest/ @@ -51,7 +53,9 @@ jobs: - name: Setup Nu uses: hustcer/setup-nu@v3 with: - version: 'nightly' + # This Nu runs nutest. The test itself still downloads and installs + # the latest MSI from nushell/nightly. + version: '0.113.1' - name: Test MSI Install shell: nu {0} diff --git a/.github/workflows/test-upgrade.yml b/.github/workflows/test-upgrade.yml index 9d5be19aa..e954ab2a0 100644 --- a/.github/workflows/test-upgrade.yml +++ b/.github/workflows/test-upgrade.yml @@ -38,7 +38,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@v7 - name: Setup Winget run: | @@ -49,7 +49,7 @@ jobs: - name: Setup Nu uses: hustcer/setup-nu@v3 with: - version: 'nightly' + version: '*' - name: Install Komac Tool shell: cmd diff --git a/.github/workflows/test-winget.yml b/.github/workflows/test-winget.yml index 56d90d211..4612741d1 100644 --- a/.github/workflows/test-winget.yml +++ b/.github/workflows/test-winget.yml @@ -38,7 +38,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@v7 - name: Upgrade Winget run: | @@ -50,7 +50,7 @@ jobs: - name: Setup Nu uses: hustcer/setup-nu@v3 with: - version: 'nightly' + version: '*' - name: Install Komac Tool shell: cmd @@ -75,12 +75,12 @@ jobs: runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@v7 - name: Setup Nu uses: hustcer/setup-nu@v3 with: - version: 'nightly' + version: '*' - name: Install Komac Tool shell: cmd @@ -105,12 +105,12 @@ jobs: runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@v7 - name: Setup Nu uses: hustcer/setup-nu@v3 with: - version: 'nightly' + version: '*' - name: Install Komac Tool shell: cmd diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2e0ae948d..9343c4dad 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -74,7 +74,7 @@ jobs: dnf install -y nushell nu -c 'version' - name: Checkout - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Run Tests run: nu nu/tests.nu @@ -94,7 +94,7 @@ jobs: sudo apt install nushell nu -c 'version' - name: Checkout - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Run Tests run: nu nu/tests.nu @@ -113,7 +113,7 @@ jobs: pacman -U --noconfirm nushell.pkg.tar.zst nu -c 'version' - name: Checkout - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Run Tests run: nu nu/tests.nu @@ -143,7 +143,7 @@ jobs: apt install nushell nu -c 'version' - name: Checkout - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Run Tests run: nu nu/tests.nu @@ -164,7 +164,7 @@ jobs: platforms: riscv64 - name: Checkout - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Test Install Nu on RISC-V run: | docker pull --platform=linux/riscv64 ${{ matrix.image }} diff --git a/meta.json b/meta.json index 7136af849..968fb321f 100644 --- a/meta.json +++ b/meta.json @@ -1,6 +1,6 @@ { "name": "nushell", - "version": "0.110.0", + "version": "0.114.1", "revision": 0, "pkgs": { "deb": true, diff --git a/nu/bump-ver.nu b/nu/bump-ver.nu index c344db220..c9f19a79f 100644 --- a/nu/bump-ver.nu +++ b/nu/bump-ver.nu @@ -30,9 +30,8 @@ export def bump-version [ export def has-ref [ ref: string # The git ref to check ] { - let checkRepo = (do -i { git rev-parse --is-inside-work-tree } | complete) + let checkRepo = git rev-parse --is-inside-work-tree | complete if not ($checkRepo.stdout =~ 'true') { return false } - # Brackets were required here, or error will occur - let parse = (do -i { git rev-parse --verify -q $ref } | complete) - if ($parse.stdout | is-empty) { false } else { true } + let parse = do { ^git rev-parse --verify -q $ref | complete } + ($parse.stdout | is-not-empty) } diff --git a/nu/release.nu b/nu/release.nu index 979241c2e..974cb02a5 100644 --- a/nu/release.nu +++ b/nu/release.nu @@ -94,7 +94,9 @@ def create-github-release [ let repo = 'nushell/integrations' let releases = gh release list -R $repo --json name | from json | get name if $version not-in $releases { - gh release create $version -R $repo --title $version + # Use try/catch to handle the race condition when multiple parallel jobs + # try to create the same release simultaneously + try { gh release create $version -R $repo --title $version } } # --clobber Overwrite existing assets of the same name if $arch in $ALPINE_IGNORE { diff --git a/nu/tests.nu b/nu/tests.nu index 65c7b1391..9e1d6bb30 100644 --- a/nu/tests.nu +++ b/nu/tests.nu @@ -1,6 +1,6 @@ #!/usr/bin/env nu -use std assert +use std/assert const NU_VERSION = '0.105.0'