Skip to content

Commit

Permalink
update install/build scripts to include --locked (#10086)
Browse files Browse the repository at this point in the history
# Description

This PR updates the toolkit and the build/install scripts to include
`--locked`, also added `extra` feature to the _all_ scripts, and
`--force` to the install scripts.

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used -A
clippy::needless_collect -A clippy::result_large_err` to check that
you're using the standard code style
- `cargo test --workspace` to check that all tests pass
- `cargo run -- -c "use std testing; testing run-tests --path
crates/nu-std"` to run the tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
  • Loading branch information
fdncred committed Aug 21, 2023
1 parent 5378727 commit ac4ab45
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 7 deletions.
2 changes: 1 addition & 1 deletion scripts/build-all-maclin.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ NU_PLUGINS=(
echo "Building nushell"
(
cd $REPO_ROOT
cargo build --features=dataframe
cargo build --features=dataframe,extra --locked
)

for plugin in "${NU_PLUGINS[@]}"
Expand Down
2 changes: 1 addition & 1 deletion scripts/build-all-windows.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ echo -------------------------------------------------------------------
echo.

echo Building nushell.exe
cargo build --features=dataframe
cargo build --features=dataframe,extra --locked
echo.

call :build crates\nu_plugin_example nu_plugin_example.exe
Expand Down
2 changes: 1 addition & 1 deletion scripts/build-all.nu
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def build-nushell [] {
print '----------------------------'

cd $repo_root
cargo build --features=dataframe
cargo build --features=dataframe,extra --locked
}

def build-plugin [] {
Expand Down
2 changes: 1 addition & 1 deletion scripts/install-all.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Write-Output ""

Write-Output "Install nushell from local..."
Write-Output "----------------------------------------------"
cargo install --force --path . --features=dataframe
cargo install --force --path . --features=dataframe,extra --locked

$NU_PLUGINS = @(
'nu_plugin_example',
Expand Down
2 changes: 1 addition & 1 deletion scripts/install-all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ echo ""

echo "Install nushell from local..."
echo "----------------------------------------------"
cargo install --force --path "$REPO_ROOT" --features=dataframe
cargo install --force --path "$REPO_ROOT" --features=dataframe,extra --locked

NU_PLUGINS=(
'nu_plugin_inc'
Expand Down
1 change: 1 addition & 0 deletions scripts/uninstall-all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ NU_PLUGINS=(
'nu_plugin_query'
'nu_plugin_example'
'nu_plugin_formats'
'nu_plugin_custom_values'
)

cargo uninstall nu
Expand Down
5 changes: 3 additions & 2 deletions toolkit.nu
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ def build-nushell [features: string] {
print $'(char nl)Building nushell'
print '----------------------------'

cargo build --features $features
cargo build --features $features --locked
}

def build-plugin [] {
Expand Down Expand Up @@ -338,7 +338,7 @@ export def install [
--all: bool # install all plugins with Nushell
] {
touch crates/nu-cmd-lang/build.rs # needed to make sure `version` has the correct `commit_hash`
cargo install --path . --features ($features | str join ",")
cargo install --path . --features ($features | str join ",") --locked --force
if not $all {
return
}
Expand All @@ -351,6 +351,7 @@ export def install [
nu_plugin_custom_values,
nu_plugin_formats,
]

for plugin in $plugins {
$plugin | install-plugin
}
Expand Down

0 comments on commit ac4ab45

Please sign in to comment.