Skip to content

Commit 0e47179

Browse files
authored
Update azure-pipelines.yml (fix perl, so signed build works) (#15857)
1 parent 77d05bb commit 0e47179

2 files changed

Lines changed: 20 additions & 8 deletions

File tree

azure-pipelines.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,8 @@ stages:
142142
/p:PublishToSymbolServer=true
143143
/p:VisualStudioDropName=$(VisualStudioDropName)
144144
/p:GenerateSbom=true
145+
env:
146+
NativeToolsOnMachine: true
145147
- script: .\tests\EndToEndBuildTests\EndToEndBuildTests.cmd -c $(_BuildConfig)
146148
displayName: End to end build tests
147149
- task: PublishTestResults@2
@@ -365,9 +367,13 @@ stages:
365367

366368
# yes, this is miserable, but - https://github.com/dotnet/arcade/issues/13239
367369
- script: eng\CIBuild.cmd -compressallmetadata -configuration $(_configuration) -$(_testKind)
370+
env:
371+
NativeToolsOnMachine: true
368372
displayName: Build / Test
369373
condition: ne(variables['_testKind'], 'testIntegration')
370374
- script: eng\CIBuild.cmd -compressallmetadata -configuration $(_configuration) -$(_testKind)
375+
env:
376+
NativeToolsOnMachine: true
371377
displayName: Build / Integration Test
372378
continueOnError: true
373379
condition: eq(variables['_testKind'], 'testIntegration')
@@ -519,6 +525,7 @@ stages:
519525
clean: true
520526
- script: .\Build.cmd -c Release -pack
521527
env:
528+
NativeToolsOnMachine: true
522529
FSHARP_EXPERIMENTAL_FEATURES: $(_experimental_flag)
523530
- script: .\tests\EndToEndBuildTests\EndToEndBuildTests.cmd -c Release
524531
env:
@@ -649,6 +656,8 @@ stages:
649656
- script: dotnet --list-sdks
650657
displayName: Report dotnet SDK versions
651658
- script: .\Build.cmd $(_kind) -pack -c $(_BuildConfig)
659+
env:
660+
NativeToolsOnMachine: true
652661
displayName: Initial build and prepare packages.
653662
- script: $(Build.SourcesDirectory)/tests/AheadOfTime/Trimming/check.cmd
654663
displayName: Build, trim, publish and check the state of the trimmed app.

eng/Build.ps1

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -514,18 +514,13 @@ try {
514514
TryDownloadDotnetFrameworkSdk
515515

516516
$nativeTools = InitializeNativeTools
517+
517518
if (-not (Test-Path variable:NativeToolsOnMachine)) {
518-
$env:PERL5Path = Join-Path $nativeTools "perl\5.32.1.1\perl\bin\perl.exe"
519+
$env:PERL5Path = Join-Path $nativeTools "perl\5.38.0.1\perl\bin\perl.exe"
519520
write-host "variable:NativeToolsOnMachine = unset or false"
520521
$nativeTools
521522
write-host "Path = $env:PERL5Path"
522523
}
523-
else {
524-
$env:PERL5Path = Join-Path $nativeTools["perl"] "perl\bin\perl.exe"
525-
write-host "variable:NativeToolsOnMachine = $variable:NativeToolsOnMachine"
526-
$nativeTools.values
527-
write-host "Path = $env:PERL5Path"
528-
}
529524

530525
$dotnetPath = InitializeDotNetCli
531526
$env:DOTNET_ROOT = "$dotnetPath"
@@ -606,7 +601,15 @@ try {
606601
$env:LINK_EXE = "$RepoRoot\tests\fsharpqa\testenv\bin\link\link.exe"
607602
$env:OSARCH = $env:PROCESSOR_ARCHITECTURE
608603
write-host "Exec-Console $env:PERL5Path"
609-
Exec-Console $env:PERL5Path """$RepoRoot\tests\fsharpqa\testenv\bin\runall.pl"" -resultsroot ""$resultsRoot"" -results $resultsLog -log $errorLog -fail $failLog -cleanup:no -procs:$env:NUMBER_OF_PROCESSORS"
604+
605+
if (-not (Test-Path variable:NativeToolsOnMachine)) {
606+
Exec-Console $env:PERL5Path """$RepoRoot\tests\fsharpqa\testenv\bin\runall.pl"" -resultsroot ""$resultsRoot"" -results $resultsLog -log $errorLog -fail $failLog -cleanup:no -procs:$env:NUMBER_OF_PROCESSORS"
607+
}
608+
else
609+
{
610+
Exec-Console "perl.exe" """$RepoRoot\tests\fsharpqa\testenv\bin\runall.pl"" -resultsroot ""$resultsRoot"" -results $resultsLog -log $errorLog -fail $failLog -cleanup:no -procs:$env:NUMBER_OF_PROCESSORS"
611+
}
612+
610613
write-host "Exec-Console finished"
611614
Pop-Location
612615
}

0 commit comments

Comments
 (0)