Fixup: Various bugs in Build Rust Project Step

Reloaded-Project · Jun 17, 2024 · 7e8bf59 · 7e8bf59
1 parent 457d257
commit 7e8bf59
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/action.yml b/action.yml
@@ -112,10 +112,6 @@ runs:
         fi
 
         BUILD_FEATURES_ARGS="${{ inputs.features }}"
-        if [ -n "$BUILD_FEATURES_ARGS" ]; then
-          BUILD_FEATURES_ARGS=""
-        fi
-
         NO_DEFAULT_FEATURES=""
         if [ "${{ inputs.no-default-features }}" == "true" ]; then
           NO_DEFAULT_FEATURES="--no-default-features"
@@ -149,7 +145,7 @@ runs:
           RUSTFLAGS="$RUSTFLAGS -Cprofile-generate=${GITHUB_WORKSPACE}/${RUST_PROJECT_PATH}/target/pgo-profiles"
 
           echo "Flags: $RUSTFLAGS"
-          echo "$BUILD_CMD +nightly rustc --release $BUILD_STD_ARGS --target ${{ inputs.target }} $CRATE_TYPES --features "$BUILD_FEATURES_ARGS,pgo" $NO_DEFAULT_FEATURES
+          echo "$BUILD_CMD +nightly rustc --release $BUILD_STD_ARGS --target ${{ inputs.target }} $CRATE_TYPES --features \"$BUILD_FEATURES_ARGS,pgo\" $NO_DEFAULT_FEATURES"
           $BUILD_CMD +nightly test --bench ${{ inputs.pgo-benchmark-name }} --release --target ${{ inputs.target }} --features "$BUILD_FEATURES_ARGS,pgo" $NO_DEFAULT_FEATURES
 
           # Merge the PGO profiles
@@ -177,7 +173,7 @@ runs:
         # Build the project
         cd "${GITHUB_WORKSPACE}/${{ inputs.rust-project-path }}"
         echo "Flags: $RUSTFLAGS"
-        echo "$BUILD_CMD +nightly rustc --release $BUILD_STD_ARGS --target ${{ inputs.target }} $CRATE_TYPES --features "$BUILD_FEATURES_ARGS" $NO_DEFAULT_FEATURES
+        echo "$BUILD_CMD +nightly rustc --release $BUILD_STD_ARGS --target ${{ inputs.target }} $CRATE_TYPES --features \"$BUILD_FEATURES_ARGS\" $NO_DEFAULT_FEATURES"
         $BUILD_CMD +nightly rustc --release $BUILD_STD_ARGS --target ${{ inputs.target }} $CRATE_TYPES --features "$BUILD_FEATURES_ARGS" $NO_DEFAULT_FEATURES
 
         echo "PWD: $(pwd)"