Bump powershell yaml versions to 0.4.7 (#8256)
Co-authored-by: Ben Broderick Phillips <bebroder@microsoft.com>
This commit is contained in:
Родитель
2499b66f32
Коммит
91a1cb3776
|
@ -12,7 +12,7 @@ param (
|
|||
$ErrorActionPreference = "Stop"
|
||||
. $PSScriptRoot/Helpers/PSModule-Helpers.ps1
|
||||
. $PSScriptRoot/common.ps1
|
||||
Install-ModuleIfNotInstalled "powershell-yaml" "0.4.1" | Import-Module
|
||||
Install-ModuleIfNotInstalled "powershell-yaml" "0.4.7" | Import-Module
|
||||
|
||||
function NpmInstallForProject([string]$workingDirectory) {
|
||||
Push-Location $workingDirectory
|
||||
|
|
|
@ -9,7 +9,7 @@ param (
|
|||
|
||||
$ErrorActionPreference = "Stop"
|
||||
. $PSScriptRoot/Helpers/PSModule-Helpers.ps1
|
||||
Install-ModuleIfNotInstalled "powershell-yaml" "0.4.1" | Import-Module
|
||||
Install-ModuleIfNotInstalled "powershell-yaml" "0.4.7" | Import-Module
|
||||
$sparseCheckoutFile = ".git/info/sparse-checkout"
|
||||
|
||||
function AddSparseCheckoutPath([string]$subDirectory) {
|
||||
|
|
|
@ -80,7 +80,7 @@ function CompatibleConvertFrom-Yaml {
|
|||
$yqPresent = Get-Command 'yq' -ErrorAction SilentlyContinue
|
||||
if (-not $yqPresent) {
|
||||
. (Join-Path $PSScriptRoot PSModule-Helpers.ps1)
|
||||
Install-ModuleIfNotInstalled -WhatIf:$false "powershell-yaml" "0.4.1" | Import-Module
|
||||
Install-ModuleIfNotInstalled -WhatIf:$false "powershell-yaml" "0.4.7" | Import-Module
|
||||
}
|
||||
|
||||
# Process the content (for example, you could convert from YAML here)
|
||||
|
|
|
@ -13,7 +13,7 @@ $ErrorActionPreference = "Stop"
|
|||
. $PSScriptRoot/Helpers/PSModule-Helpers.ps1
|
||||
. $PSScriptRoot/Helpers/CommandInvocation-Helpers.ps1
|
||||
. $PSScriptRoot/common.ps1
|
||||
Install-ModuleIfNotInstalled "powershell-yaml" "0.4.1" | Import-Module
|
||||
Install-ModuleIfNotInstalled "powershell-yaml" "0.4.7" | Import-Module
|
||||
|
||||
function NpmInstallForProject([string]$workingDirectory) {
|
||||
Push-Location $workingDirectory
|
||||
|
|
|
@ -14,7 +14,7 @@ param (
|
|||
|
||||
. $PSScriptRoot/common.ps1
|
||||
. $PSScriptRoot/Helpers/PSModule-Helpers.ps1
|
||||
Install-ModuleIfNotInstalled "powershell-yaml" "0.4.1" | Import-Module
|
||||
Install-ModuleIfNotInstalled "powershell-yaml" "0.4.7" | Import-Module
|
||||
|
||||
function CreateUpdate-TspLocation([System.Object]$tspConfig, [string]$TypeSpecProjectDirectory, [string]$CommitHash, [string]$repo, [string]$repoRoot, [ref]$isNewSdkProject) {
|
||||
$additionalDirs = @()
|
||||
|
@ -225,4 +225,4 @@ if ($SkipSyncAndGenerate -and !$isNewSdkProject) {
|
|||
}
|
||||
}
|
||||
|
||||
return $sdkProjectFolder
|
||||
return $sdkProjectFolder
|
||||
|
|
|
@ -11,7 +11,7 @@ param (
|
|||
|
||||
$ErrorActionPreference = "Stop"
|
||||
. $PSScriptRoot/Helpers/PSModule-Helpers.ps1
|
||||
Install-ModuleIfNotInstalled "powershell-yaml" "0.4.1" | Import-Module
|
||||
Install-ModuleIfNotInstalled "powershell-yaml" "0.4.7" | Import-Module
|
||||
$sparseCheckoutFile = ".git/info/sparse-checkout"
|
||||
|
||||
function AddSparseCheckoutPath([string]$subDirectory) {
|
||||
|
|
|
@ -55,7 +55,7 @@ param(
|
|||
. $PSScriptRoot/common.ps1
|
||||
. $PSScriptRoot/Helpers/PSModule-Helpers.ps1
|
||||
|
||||
Install-ModuleIfNotInstalled "powershell-yaml" "0.4.1" | Import-Module
|
||||
Install-ModuleIfNotInstalled "powershell-yaml" "0.4.7" | Import-Module
|
||||
|
||||
Set-StrictMode -Version 3
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
. (Join-Path $PSScriptRoot common.ps1)
|
||||
Install-Module -Name powershell-yaml -RequiredVersion 0.4.1 -Force -Scope CurrentUser
|
||||
Install-Module -Name powershell-yaml -RequiredVersion 0.4.7 -Force -Scope CurrentUser
|
||||
$ymlfiles = Get-ChildItem $RepoRoot -recurse | Where-Object {$_ -like '*.yml'}
|
||||
$affectedRepos = [System.Collections.ArrayList]::new()
|
||||
|
||||
|
@ -48,4 +48,4 @@ if ($affectedRepos.Count -gt 0)
|
|||
exit 1
|
||||
}
|
||||
|
||||
Write-Output "All repository resources in yaml files reference a valid tag"
|
||||
Write-Output "All repository resources in yaml files reference a valid tag"
|
||||
|
|
|
@ -50,7 +50,7 @@ if (-not $GitHubPat) {
|
|||
|
||||
Write-Host "The spec used to release SDK should be from the main branch of Azure/azure-rest-api-specs repository."
|
||||
Write-Host "ServiceDir:$ServiceDirectory, PackageName:$PackageName, ArtifactLocation:$ArtifactLocation, PackageInfoDirectory:$PackageInfoDirectory."
|
||||
Install-ModuleIfNotInstalled "powershell-yaml" "0.4.1" | Import-Module
|
||||
Install-ModuleIfNotInstalled "powershell-yaml" "0.4.7" | Import-Module
|
||||
|
||||
# This function is used to verify the 'require' and 'input-file' settings in autorest.md point to the main branch of Azure/azure-rest-api-specs repository
|
||||
# input-file may be:
|
||||
|
|
|
@ -213,7 +213,7 @@ function GetMatrixConfigFromFile([String] $config) {
|
|||
}
|
||||
|
||||
function GetMatrixConfigFromYaml([String] $yamlConfig) {
|
||||
Install-ModuleIfNotInstalled "powershell-yaml" "0.4.1" | Import-Module
|
||||
Install-ModuleIfNotInstalled "powershell-yaml" "0.4.7" | Import-Module
|
||||
# ConvertTo then from json is to make sure the nested values are in PSCustomObject
|
||||
[MatrixConfig]$config = ConvertFrom-Yaml $yamlConfig -Ordered | ConvertTo-Json -Depth 100 | ConvertFrom-Json
|
||||
return GetMatrixConfig $config
|
||||
|
|
|
@ -414,7 +414,7 @@ function CheckDependencies()
|
|||
}
|
||||
)
|
||||
|
||||
Install-ModuleIfNotInstalled "powershell-yaml" "0.4.1" | Import-Module
|
||||
Install-ModuleIfNotInstalled "powershell-yaml" "0.4.7" | Import-Module
|
||||
|
||||
$shouldError = $false
|
||||
foreach ($dep in $deps) {
|
||||
|
|
Загрузка…
Ссылка в новой задаче