mirror of
https://github.com/PowerShell/PowerShell
synced 2026-06-08 12:12:50 +00:00
[release/v7.4]Add UseDotnet task for installing dotnet (#25080)
Co-authored-by: Aditya Patwardhan <adityap@microsoft.com>
This commit is contained in:
co-authored by
Aditya Patwardhan
parent
78e2a13ed9
commit
61ce3a3dcc
+1
-5
@@ -188,8 +188,6 @@ function Invoke-CIInstall
|
||||
}
|
||||
|
||||
Set-BuildVariable -Name TestPassed -Value False
|
||||
Write-Verbose -Verbose -Message "Calling Start-PSBootstrap from Invoke-CIInstall"
|
||||
Start-PSBootstrap
|
||||
}
|
||||
|
||||
function Invoke-CIxUnit
|
||||
@@ -402,8 +400,6 @@ function New-CodeCoverageAndTestPackage
|
||||
|
||||
if (Test-DailyBuild)
|
||||
{
|
||||
Start-PSBootstrap -Verbose
|
||||
|
||||
Start-PSBuild -Configuration 'CodeCoverage' -Clean
|
||||
|
||||
$codeCoverageOutput = Split-Path -Parent (Get-PSOutput)
|
||||
@@ -717,7 +713,7 @@ function Invoke-BootstrapStage
|
||||
Write-Log -Message "Executing ci.psm1 Bootstrap Stage"
|
||||
# Make sure we have all the tags
|
||||
Sync-PSTags -AddRemoteIfMissing
|
||||
Start-PSBootstrap -Package:$createPackages
|
||||
Start-PSBootstrap -Scenario Package:$createPackages
|
||||
}
|
||||
|
||||
# Run pester tests for Linux and macOS
|
||||
|
||||
@@ -1635,7 +1635,7 @@ function Get-PackageDependencies
|
||||
function Test-Dependencies
|
||||
{
|
||||
foreach ($Dependency in "fpm") {
|
||||
if (!(precheck $Dependency "Package dependency '$Dependency' not found. Run Start-PSBootstrap -Package")) {
|
||||
if (!(precheck $Dependency "Package dependency '$Dependency' not found. Run Start-PSBootstrap -Scenario Package")) {
|
||||
# These tools are not added to the path automatically on OpenSUSE 13.2
|
||||
# try adding them to the path and re-tesing first
|
||||
[string] $gemsPath = $null
|
||||
@@ -1645,7 +1645,7 @@ function Test-Dependencies
|
||||
$depenencyPath = Get-ChildItem -Path (Join-Path -Path $gemsPath -ChildPath "gems" -AdditionalChildPath $Dependency) -Recurse | Sort-Object -Property LastWriteTime -Descending | Select-Object -First 1 -ExpandProperty DirectoryName
|
||||
$originalPath = $env:PATH
|
||||
$env:PATH = $ENV:PATH +":" + $depenencyPath
|
||||
if ((precheck $Dependency "Package dependency '$Dependency' not found. Run Start-PSBootstrap -Package")) {
|
||||
if ((precheck $Dependency "Package dependency '$Dependency' not found. Run Start-PSBootstrap -Scenario Package")) {
|
||||
continue
|
||||
}
|
||||
else {
|
||||
|
||||
@@ -248,7 +248,7 @@ jobs:
|
||||
- powershell: |
|
||||
Import-Module "$env:POWERSHELLROOT/build.psm1"
|
||||
|
||||
Start-PSBootstrap -Package
|
||||
Start-PSBootstrap -Scenario Package
|
||||
displayName: 'Bootstrap'
|
||||
condition: and(succeeded(), ne(variables['SkipBuild'], 'true'))
|
||||
workingDirectory: $(PowerShellRoot)
|
||||
|
||||
@@ -57,7 +57,7 @@ jobs:
|
||||
- powershell: |
|
||||
Import-Module "$env:POWERSHELLROOT/build.psm1"
|
||||
|
||||
Start-PSBootstrap -Package
|
||||
Start-PSBootstrap -Scenario Package
|
||||
displayName: 'Bootstrap'
|
||||
condition: and(succeeded(), ne(variables['SkipBuild'], 'true'))
|
||||
workingDirectory: $(PowerShellRoot)
|
||||
|
||||
Reference in New Issue
Block a user