From d3919a311fe6328181ad4fc11dba4bbcab89d34a Mon Sep 17 00:00:00 2001
From: nibon7 <nibon7@163.com>
Date: Thu, 29 Jun 2023 12:43:09 +0800
Subject: [PATCH] Refactor cargo-build-nu (#9554)

# Description
This PR refactors `cargo-build-nu`

cc @hustcer

# 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 -- crates/nu-std/tests/run.nu` 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.
-->
---
 .github/workflows/release-pkg.nu | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/release-pkg.nu b/.github/workflows/release-pkg.nu
index 2044f644a8..61c9d4369b 100755
--- a/.github/workflows/release-pkg.nu
+++ b/.github/workflows/release-pkg.nu
@@ -99,12 +99,7 @@ if $os in [$USE_UBUNTU, 'macos-latest'] {
 # Build for Windows without static-link-openssl feature
 # ----------------------------------------------------------------------------
 if $os in ['windows-latest'] {
-    # let-env CARGO_BUILD_TARGET = $target
-    if ($flags | str trim | is-empty) {
-        cargo build --release --all --target $target
-    } else {
-        cargo build --release --all --target $target $flags
-    }
+    cargo-build-nu $flags
 }
 
 # ----------------------------------------------------------------------------
@@ -194,11 +189,13 @@ if $os in [$USE_UBUNTU, 'macos-latest'] {
 }
 
 def 'cargo-build-nu' [ options: string ] {
-    if ($options | str trim | is-empty) {
-        cargo build --release --all --target $target --features=static-link-openssl
+    let features = if $os == 'windows-latest' {
+        ''
     } else {
-        cargo build --release --all --target $target --features=static-link-openssl $options
+        '--features=static-link-openssl'
     }
+
+    cargo build --release --all --target $target $features $options
 }
 
 # Print a horizontal line marker