Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 48f902c

Browse files
committedAug 2, 2021
Attempt to download the tar file manually and include as a local file to the Helix payload
1 parent 1ed87a1 commit 48f902c

File tree

1 file changed

+13
-9
lines changed

1 file changed

+13
-9
lines changed
 

‎src/libraries/sendtohelixhelp.proj

+13-9
Original file line numberDiff line numberDiff line change
@@ -337,11 +337,6 @@
337337
<ChromeDriverUrl>https://storage.googleapis.com/chromium-browser-snapshots/Win_x64/$(ChromiumRevision)/chromedriver_win32.zip</ChromeDriverUrl>
338338
</PropertyGroup>
339339

340-
<PropertyGroup Condition="'$(ForNode)' == 'true'">
341-
<!-- Helix has an old version of Node that we don't support. So we send a valid version (current LTS) in the correlation payload -->
342-
<NodeUrl>https://nodejs.org/dist/latest-v14.x/node-v14.17.4-linux-x64.tar.xz</NodeUrl>
343-
</PropertyGroup>
344-
345340
<PropertyGroup Condition="'$(RuntimeFlavor)' == 'Mono'">
346341
<_MonoAotCrossCompilerPath>$([MSBuild]::NormalizePath($(MonoAotCrossDir), 'mono-aot-cross'))</_MonoAotCrossCompilerPath>
347342
<_MonoAotCrossCompilerPath Condition="$([MSBuild]::IsOSPlatform('WINDOWS'))">$(_MonoAotCrossCompilerPath).exe</_MonoAotCrossCompilerPath>
@@ -381,20 +376,29 @@
381376
<HelixCorrelationPayload Include="$(JsonToItemsTaskFactoryDir)" Destination="build/JsonToItemsTaskFactory" />
382377
</ItemGroup>
383378

384-
<ItemGroup Condition="'$(TargetOS)' == 'Browser' and '$(Scenario)' != 'BuildWasmApps'">
379+
<ItemGroup Condition="'$(TargetOS)' == 'Browser' and '$(Scenario)' != 'git logBuildWasmApps'">
385380
<HelixCorrelationPayload Include="$(TestEchoMiddleware)" Destination="xharness/TestEchoMiddleware" />
386381
<HelixCorrelationPayload Include="$(RemoteLoopMiddleware)" Destination="xharness/RemoteLoopMiddleware" />
387382
</ItemGroup>
388383

384+
<!-- Helix has an old version of Node that we don't support. So we send a valid version (current LTS) in the correlation payload -->
385+
<NodeFolder Condition="'$(ForNode)' == 'true'">$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'bin', 'nodejs'))</NodeFolder>
386+
<DownloadFile Condition="'$(ForNode)' == 'true'"
387+
SourceUrl="https://nodejs.org/dist/latest-v14.x/node-v14.17.4-linux-x64.tar.xz"
388+
DestinationFolder="$(NodeFolder)"/>
389+
<Exec Command="tar -xf node-v14.17.4-linux-x64.tar.xz"
390+
WorkingDirectory="$(NodeFolder)"
391+
IgnoreStandardErrorWarningFormat="true"
392+
Condition="'$(ForNode)' == 'true'"/>
393+
<HelixCorrelationPayload Include="$(NodeFolder)/node-v14.17.4-linux-x64/bin" Condition="'$(ForNode)' == 'true'" />
394+
389395
<ItemGroup Condition="'$(TargetOS)' != 'Android' and '$(TargetOS)' != 'iOS' and '$(TargetOS)' != 'iOSSimulator' and '$(TargetOS)' != 'tvOS' and '$(TargetOS)' != 'tvOSSimulator' and '$(TargetOS)' != 'MacCatalyst'">
390396
<HelixCorrelationPayload Include="$(HelixCorrelationPayload)"
391397
Condition="'$(IncludeHelixCorrelationPayload)' == 'true' and '$(TargetOS)' != 'Browser'"
392-
AsArchive="$(HelixCorrelationPayload.EndsWith('.zip')) or $(HelixCorrelationPayload.EndsWith('.tar.xz'))" />
398+
AsArchive="$(HelixCorrelationPayload.EndsWith('.zip')))" />
393399
<HelixCorrelationPayload Include="chromium" Uri="$(ChromiumUrl)" Condition="'$(NeedsToRunOnBrowser)' == 'true'" />
394400
<HelixCorrelationPayload Include="chromedriver" Uri="$(ChromeDriverUrl)" Condition="'$(NeedsToRunOnBrowser)' == 'true'" />
395401

396-
<HelixCorrelationPayload Include="nodejs" Uri="$(NodeUrl)" Condition="'$(ForNode)' == 'true'" />
397-
398402
<_WorkItem Include="$(WorkItemArchiveWildCard)" Exclude="$(HelixCorrelationPayload)" />
399403
<_WorkItem Include="$(TestArchiveRoot)runonly/**/WebAssembly.Console.*.Test.zip" Condition="'$(TargetOS)' == 'Browser' and '$(Scenario)' != 'WasmTestOnBrowser' and '$(Scenario)' != 'BuildWasmApps'" />
400404
<_WorkItem Include="$(TestArchiveRoot)runonly/**/WebAssembly.Browser.*.Test.zip" Condition="'$(TargetOS)' == 'Browser' and '$(Scenario)' == 'WasmTestOnBrowser'" />

0 commit comments

Comments
 (0)
Please sign in to comment.