This is an automated email from the ASF dual-hosted git repository. nightowl888 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/lucenenet.git
commit b5ea527c5bd125dd1db34d8b914e1a5d72e08ffa Author: Shad Storhaug <[email protected]> AuthorDate: Wed Jun 1 07:25:53 2022 +0700 install-dotnet-sdk.yml, run-tests-on-os.yml: Added performMultiLevelLookup parameter for x86 tests --- .build/azure-templates/install-dotnet-sdk.yml | 4 +++- .build/azure-templates/run-tests-on-os.yml | 17 +++++++++++++++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.build/azure-templates/install-dotnet-sdk.yml b/.build/azure-templates/install-dotnet-sdk.yml index 473799629..ec0e1219e 100644 --- a/.build/azure-templates/install-dotnet-sdk.yml +++ b/.build/azure-templates/install-dotnet-sdk.yml @@ -19,6 +19,7 @@ parameters: sdkVersion: '' # The .NET SDK version to install + performMultiLevelLookup: 'false' # Whether to check for x86 when running commands steps: - pwsh: | @@ -39,4 +40,5 @@ steps: displayName: 'Use .NET SDK ${{ parameters.sdkVersion }}' inputs: packageType: 'sdk' - version: '${{ parameters.sdkVersion }}' \ No newline at end of file + version: '${{ parameters.sdkVersion }}' + performMultiLevelLookup: '${{ parameters.performMultiLevelLookup }}' \ No newline at end of file diff --git a/.build/azure-templates/run-tests-on-os.yml b/.build/azure-templates/run-tests-on-os.yml index 9500e3167..b1282f20a 100644 --- a/.build/azure-templates/run-tests-on-os.yml +++ b/.build/azure-templates/run-tests-on-os.yml @@ -75,20 +75,33 @@ steps: #- pwsh: Get-ChildItem -Path $(System.DefaultWorkingDirectory) # Uncomment for debugging +- pwsh: | + $testPlatform = '${{ parameters.vsTestPlatform }}' + if ($IsWindows -eq $null) { + $IsWindows = $env:OS.StartsWith('Win') + } + $performMulitLevelLookup = if ($IsWindows -and $testPlatform.Equals('x86')) { 'true' } else { 'false' } + Write-Host "##vso[task.setvariable variable=PerformMultiLevelLookup;]$performMulitLevelLookup" + - template: 'install-dotnet-sdk.yml' parameters: sdkVersion: '${{ parameters.dotNetSdkVersion }}' + performMultiLevelLookup: '${{ variables.PerformMultiLevelLookup }}' - task: UseDotNet@2 displayName: 'Use .NET Core sdk 3.1.412' inputs: - version: 3.1.412 + packageType: 'sdk' + version: '3.1.412' + performMultiLevelLookup: '${{ variables.PerformMultiLevelLookup }}' condition: and(succeeded(), contains('${{ parameters.framework }}', 'netcoreapp3.')) - task: UseDotNet@2 displayName: 'Use .NET sdk 5.0.400' inputs: - version: 5.0.400 + packageType: 'sdk' + version: '5.0.400' + performMultiLevelLookup: '${{ variables.PerformMultiLevelLookup }}' condition: and(succeeded(), contains('${{ parameters.framework }}', 'net5.')) #- template: 'show-all-files.yml' # Uncomment for debugging
