Skip to content

Commit

Permalink
Merge a975cbe into 724ecf1
Browse files Browse the repository at this point in the history
  • Loading branch information
ckairen authored Nov 8, 2024
2 parents 724ecf1 + a975cbe commit 2d80359
Show file tree
Hide file tree
Showing 5 changed files with 74 additions and 6 deletions.
2 changes: 0 additions & 2 deletions eng/pipelines/templates/stages/archetype-js-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ stages:
condition: succeeded()
- template: /eng/pipelines/templates/steps/npm-release-task.yml
parameters:
ArtifactName: ${{parameters.ArtifactName}}
Artifact: ${{artifact}}
Registry: ${{parameters.Registry}}
PathToArtifacts: $(Pipeline.Workspace)/${{parameters.ArtifactName}}/${{artifact.name}}
Expand Down Expand Up @@ -258,7 +257,6 @@ stages:
displayName: Detecting package archive_${{artifact.name}}
- template: /eng/pipelines/templates/steps/npm-release-task.yml
parameters:
ArtifactName: ${{parameters.ArtifactName}}
Artifact: ${{artifact}}
Registry: ${{parameters.Registry}}
PathToArtifacts: $(Pipeline.Workspace)/${{parameters.ArtifactName}}/${{artifact.name}}
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/templates/stages/archetype-sdk-client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ extends:
Artifacts: ${{ parameters.Artifacts }}
${{ if eq(parameters.ServiceDirectory, 'template') }}:
TestPipeline: true
RunUnitTests: ${{ parameters.RunUnitTests }}
RunUnitTests: false
MatrixConfigs:
- ${{ each config in parameters.MatrixConfigs }}:
- ${{ config }}
Expand Down
1 change: 0 additions & 1 deletion eng/pipelines/templates/stages/partner-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ extends:

- template: /eng/pipelines/templates/steps/npm-release-task.yml
parameters:
ArtifactName: Partner Drop
Artifact:
name: Partner Drop
path: $(Artifacts)
Expand Down
27 changes: 25 additions & 2 deletions eng/pipelines/templates/steps/npm-release-task.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
parameters:
ArtifactName: ''
Artifact: {}
Registry: ''
PathToArtifacts: ''
Expand All @@ -10,6 +9,22 @@ steps:
- template: /eng/common/pipelines/templates/steps/set-default-branch.yml

- ${{ if eq(parameters.Registry, 'https://registry.npmjs.org/') }}:
- pwsh: |
$tarFile = (Get-ChildItem -Path "${{parameters.PathToArtifacts}}/*.tgz").FullName
$tempDir = "$(System.DefaultWorkingDirectory)/temp_decompress"
New-Item -ItemType Directory -Force -Path $tempDir
tar -xzf $tarFile -C $tempDir
$packageJsonDir = "$tempDir\package\package.json"
echo "##vso[task.setvariable variable=PackageJsonDir]$packageJsonDir"
$pkg = Get-Content -Raw "$packageJsonDir" | ConvertFrom-Json
$packageName = $pkg.Name
$packageVersion = $pkg.Version
$packageProps = npm view $packageName -json | ConvertFrom-Json
$originalTags = $packageProps.'dist-tags' | ConvertTo-Json -Compress
echo "##vso[task.setvariable variable=OriginalTags]$originalTags"
echo "##vso[task.setvariable variable=IntendedTagVersion]$packageVersion"
displayName: Get original tags
- task: EsrpRelease@7
inputs:
displayName: 'Publish ${{parameters.Artifact.name}} to ESRP'
Expand All @@ -26,7 +41,15 @@ steps:
ServiceEndpointUrl: 'https://api.esrp.microsoft.com'
MainPublisher: 'ESRPRELPACMANTEST'
DomainTenantId: '72f988bf-86f1-41af-91ab-2d7cd011db47'
productstate: ${{parameters.Tag}}
# productstate: ${{parameters.Tag}}

- task: Powershell@2
displayName: Verify package tags
inputs:
targetType: filePath
filePath: eng/scripts/verify-npm-tags.ps1
arguments: -originalDistTags '$(OriginalTags)' -intendedTag ${{parameters.Tag}} -intendedTagVersion '$(IntendedTagVersion)' -packageJson $(PackageJsonDir)
pwsh: true

- ${{ if ne(parameters.AdditionalTag, '') }}:
- task: PowerShell@2
Expand Down
48 changes: 48 additions & 0 deletions eng/scripts/verify-npm-tags.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
param (
[Parameter(mandatory = $true)]
$originalDistTags,
[Parameter(mandatory = $true)]
$intendedTag,
[Parameter(mandatory = $true)]
$intendedTagVersion,
[Parameter(mandatory = $true)]
$packageJson
)

$ErrorActionPreference = 'Stop'
$PSNativeCommandUseErrorActionPreference = $true

$pkg = Get-Content -Raw $packageJson | ConvertFrom-Json
$packageName = $pkg.Name

Write-Host "Verify npm tag versions for package $packageName"

$parsedOriginalDistTags = $originalDistTags | ConvertFrom-Json

$npmPkgProp = npm view $packageName --json | ConvertFrom-Json
$packageDistTags = $npmPkgProp."dist-tags"

Write-Host "Original dist-tag: $parsedOriginalDistTags"
Write-Host "Current dist-tag: $packageDistTags"
Write-Host "Intend to add tag $intendedTag to version $intendedTagVersion"

if ($packageDistTags."$intendedTag" -ne $intendedTagVersion) {
Write-Warning "Tag not correctly set, current $intendedTag tag is version $($packageDistTags."$intendedTag") instead of $intendedTagVersion."
$correctDistTags = $parsedOriginalDistTags
$correctDistTags."$intendedTag" = $intendedTagVersion
Write-Host "Setting AuthToken Deployment"
$regAuth = "//registry.npmjs.org/"
write-host "azure sdk npm token"
Write-Host $env:azure-sdk-npm-token
write-host $(azure-sdk-npm-token)
npm config set $regAuth`:_authToken=`$`{azure-sdk-npm-token`}
foreach($tag in $correctDistTags.PSObject.Properties) {
Write-Host "npm dist-tag add $packageName@$($tag.value) $($tag.Name)"
npm dist-tag add $packageName@$($tag.value) $($tag.Name)
}
$npmPkgProp = npm view $packageName --json | ConvertFrom-Json
$packageDistTags = $npmPkgProp."dist-tags"
Write-Host "Corrected dist tags to: $packageDistTags"
} else {
Write-Host "Tag verified."
}

0 comments on commit 2d80359

Please sign in to comment.