CI test

Signed-off-by: Joel Dice <[email protected]>
dotnet · Jun 26, 2024 · 140cece · 140cece
1 parent 1d1c61f
commit 140cece
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml
@@ -214,19 +214,17 @@ jobs:
       - ${{ if ne(parameters.hostedOs, 'windows') }}:
         - script: $(Build.SourcesDirectory)/eng/pipelines/runtimelab/install-pwsh.sh $(Build.SourcesDirectory)/wasm-tools
           displayName: Install Powershell 7
+      - script: pwsh $(Build.SourcesDirectory)/eng/pipelines/runtimelab/install-nodejs.ps1 $(Build.SourcesDirectory)\wasm-tools $(Build.SourcesDirectory)
+        displayName: Install NodeJS
       - script: pwsh $(Build.SourcesDirectory)/eng/pipelines/runtimelab/install-llvm.ps1 -CloneDir $(Build.SourcesDirectory)/wasm-tools -Configs ${{ parameters.buildConfig }} -CI
         displayName: Install/build LLVM
-      - script: pwsh $(Build.SourcesDirectory)/eng/pipelines/runtimelab/install-nodejs.ps1 $(Build.SourcesDirectory)\wasm-tools
-        displayName: Install NodeJS
 
     - ${{ if and(eq(parameters.runtimeFlavor, 'coreclr'), eq(parameters.platform, 'wasi_wasm_win')) }}:
       # Install Wasi Wasm dependencies: wasi-sdk, wasmtime
       - script: call $(Build.SourcesDirectory)/eng/pipelines/runtimelab/install-wasi-sdk.cmd $(Build.SourcesDirectory)\wasm-tools
         displayName: Install wasi-sdk
       - script: call $(Build.SourcesDirectory)/eng/pipelines/runtimelab/install-wasmtime.cmd $(Build.SourcesDirectory)\wasm-tools
         displayName: Install wasmtime
-      - script: npm install -g @bytecodealliance/jco
-        displayName: Install jco
 
     - ${{ if or(eq(parameters.platform, 'browser_wasm_win'), and(eq(parameters.platform, 'wasi_wasm_win'), not(eq(parameters.runtimeFlavor, 'coreclr')))) }}:
       # Update machine certs

diff --git a/eng/pipelines/runtimelab/install-nodejs.ps1 b/eng/pipelines/runtimelab/install-nodejs.ps1
@@ -1,4 +1,5 @@
 $InstallPath = $Args[0]
+$RootPath = $Args[1]
 $NodeJSVersion = "v20.2.0"
 
 if (!(Test-Path variable:global:IsWindows))
@@ -51,11 +52,13 @@ if ($IsWindows)
 {
     Expand-Archive -LiteralPath "$InstallPath\$NodeJSZipName" -DestinationPath $InstallPath -Force
     $NodeJSExePath = "$InstallPath\$NodeJSInstallName\node.exe"
+    $NpmExePath = "$InstallPath\$NodeJSInstallName\npm.cmd"
 }
 else
 {
     tar xJf $InstallPath/$NodeJSZipName -C $InstallPath
     $NodeJSExePath = "$InstallPath/$NodeJSInstallName/bin/node"
+    $NpmExePath = "$InstallPath/$NodeJSInstallName/bin/npm"
 }
 
 if (!(Test-Path $NodeJSExePath))
@@ -64,5 +67,15 @@ if (!(Test-Path $NodeJSExePath))
     exit 1
 }
 
+if (!(Test-Path $NpmExePath))
+{
+    Write-Error "Did not find NPM at: '$NpmExePath'"
+    exit 1
+}
+
+SetLocation -Path $RootPath
+$NpmCommand = "$NpmExePath install @bytecodealliance/jco"
+Invoke-Expression $NpmCommand
+
 Write-Host Setting NODEJS_EXECUTABLE to $NodeJSExePath
 Write-Host "##vso[task.setvariable variable=NODEJS_EXECUTABLE]$NodeJSExePath"
diff --git a/src/tests/Directory.Build.props b/src/tests/Directory.Build.props
@@ -179,7 +179,8 @@
   <!-- Set Test Wrapper running host OS -->
   <PropertyGroup>
     <TestWrapperTargetsWindows>false</TestWrapperTargetsWindows>
-    <TestWrapperTargetsWindows Condition=" ('$(TargetsWindows)' != '' And '$(TargetsWindows)' ) OR ('$(TargetOS)' == 'android' And '$(TargetArchitecture)' == 'arm64' )">true</TestWrapperTargetsWindows>
+    <!-- TODO-LLVM: we only support building on windows for LLVM, so if the TargetArchitecture == 'wasm', assume windows.  Change when we support Linux/MacOS -->
+    <TestWrapperTargetsWindows Condition=" ('$(TargetsWindows)' != '' And '$(TargetsWindows)' ) OR ('$(TargetOS)' == 'android' And '$(TargetArchitecture)' == 'arm64' ) OR ('$(TargetArchitecture)' == 'wasm')">true</TestWrapperTargetsWindows>
     <TestScriptExtension Condition="'$(TestWrapperTargetsWindows)' != 'true' ">sh</TestScriptExtension>
     <TestScriptExtension Condition="'$(TestWrapperTargetsWindows)' == 'true' ">cmd</TestScriptExtension>
   </PropertyGroup>