Moved to one line CLI Argument

This is done because of facing errors in GitHub Action https://github.com/rs-workspace/rust-toolchain/actions/runs/11311735544/job/31458308764
rs-workspace · Oct 13, 2024 · 9d0e211 · 9d0e211
1 parent 1e7a0d5
commit 9d0e211
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 62 deletions.
diff --git a/__tests__/toolchain_install.test.ts b/__tests__/toolchain_install.test.ts
@@ -45,16 +45,11 @@ describe('install_toolchain', () => {
       'rustup-init.exe'
     )
 
-    expect(mockedExec).toHaveBeenCalledWith('./rustup-init.exe', [
-      '-v',
-      '--default-toolchain',
-      'stable',
-      '--profile',
-      'minimal',
-      '-y'
-    ])
-
-    expect(mockedExec).toHaveBeenCalledWith('rm', ['rustup-init.exe'])
+    expect(mockedExec).toHaveBeenCalledWith(
+      './rustup-init.exe -v --default-toolchain stable --profile minimal -y'
+    )
+
+    expect(mockedExec).toHaveBeenCalledWith('rm rustup-init.exe')
   })
 
   test('should install Rust on Windows ia32', async () => {
@@ -70,16 +65,11 @@ describe('install_toolchain', () => {
       'rustup-init.exe'
     )
 
-    expect(mockedExec).toHaveBeenCalledWith('./rustup-init.exe', [
-      '-v',
-      '--default-toolchain',
-      'stable',
-      '--profile',
-      'minimal',
-      '-y'
-    ])
+    expect(mockedExec).toHaveBeenCalledWith(
+      './rustup-init.exe -v --default-toolchain stable --profile minimal -y'
+    )
 
-    expect(mockedExec).toHaveBeenCalledWith('rm', ['rustup-init.exe'])
+    expect(mockedExec).toHaveBeenCalledWith('rm rustup-init.exe')
   })
 
   test('should throw an error for unsupported architecture on Windows', async () => {
@@ -100,14 +90,9 @@ describe('install_toolchain', () => {
     await install_toolchain(properties, platform)
 
     expect(mockedDownloadFile).not.toHaveBeenCalled()
-    expect(mockedExec).toHaveBeenCalledWith('curl', [
-      '--proto https --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -v',
-      '--default-toolchain',
-      'stable',
-      '--profile',
-      'minimal',
-      '-y'
-    ])
+    expect(mockedExec).toHaveBeenCalledWith(
+      'curl --proto https --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -v --default-toolchain stable --profile minimal -y'
+    )
   })
 
   test('should handle errors thrown by download_rust', async () => {

diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/toolchain.ts b/src/toolchain.ts
@@ -58,27 +58,17 @@ async function download_rust(
       }
 
       // install rust via installer
-      await exec.exec('./rustup-init.exe', [
-        '-v',
-        '--default-toolchain',
-        properties.rust_toolchain,
-        '--profile',
-        properties.profile,
-        '-y'
-      ])
+      await exec.exec(
+        `./rustup-init.exe -v --default-toolchain ${properties.rust_toolchain} --profile ${properties.profile} -y`
+      )
 
       // uninstall the installer
-      await exec.exec('rm', ['rustup-init.exe'])
+      await exec.exec('rm rustup-init.exe')
     } else {
       // Install installer via direct script and download rust
-      await exec.exec('curl', [
-        '--proto https --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -v',
-        '--default-toolchain',
-        properties.rust_toolchain,
-        '--profile',
-        properties.profile,
-        '-y'
-      ])
+      await exec.exec(
+        `curl --proto https --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -v --default-toolchain ${properties.rust_toolchain} --profile ${properties.profile} -y`
+      )
     }
   } catch (error) {
     if (error instanceof Error) throw error