Merge 1c861db into 85298ef

Azure · Apr 30, 2024 · f29ada9 · f29ada9
2 parents 85298ef + 1c861db
commit f29ada9
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 14 deletions.
diff --git a/eng/pipelines/templates/stages/archetype-js-release.yml b/eng/pipelines/templates/stages/archetype-js-release.yml
@@ -98,8 +98,8 @@ stages:
                                 Artifact: ${{artifact}}
                                 Registry: ${{parameters.Registry}}
                                 PathToArtifacts: $(Pipeline.Workspace)/${{parameters.ArtifactName}}/${{artifact.name}}
-                                Tag: "$(Tag)"
-                                AdditionalTag: "$(AdditionalTag)"
+                                Tag: $(Tag)
+                                AdditionalTag: $(AdditionalTag)
                             - pwsh: >
                                 write-host "$(Package.Archive)"
 

diff --git a/eng/pipelines/templates/stages/archetype-sdk-client.yml b/eng/pipelines/templates/stages/archetype-sdk-client.yml
@@ -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 }}

diff --git a/eng/pipelines/templates/steps/npm-release-task.yml b/eng/pipelines/templates/steps/npm-release-task.yml
@@ -8,7 +8,7 @@ parameters:
 
 steps:
   - template: /eng/common/pipelines/templates/steps/set-default-branch.yml
-  - ${{if eq(parameters.Registry, 'https://registry.npmjs.org/')}}:
+  - ${{ if eq(parameters.Registry, 'https://registry.npmjs.org/') }}:
       - task: EsrpRelease@6
         inputs:
           displayName: 'Publish ${{parameters.Artifact.name}} to ESRP'
@@ -23,15 +23,16 @@ steps:
           DomainTenantId: '72f988bf-86f1-41af-91ab-2d7cd011db47'
           ProductStateField: ${{parameters.Tag}}
 
-      - ${{if ne(parameters.AdditionalTag, '')}}:
-        - task: PowerShell@2
-          displayName: Add Additional Tag
-          inputs:
-            targetType: filePath
-            filePath: eng/tools/publish-to-npm.ps1
-            arguments: -addTag $true -pathToArtifacts ${{parameters.PathToArtifacts}} -accessLevel "public" -tag "${{parameters.AdditionalTag}}" -registry ${{parameters.Registry}} -npmToken $(azure-sdk-npm-token)
-            pwsh: true
-          condition: succeeded()
+      - ${{ if ne(parameters.AdditionalTag, '') }}:
+          - pwsh: Write-host "additional tag '${{parameters.AdditionalTag}}'"
+          - task: PowerShell@2
+            displayName: Add Additional Tag
+            inputs:
+              targetType: filePath
+              filePath: eng/tools/publish-to-npm.ps1
+              arguments: -addTag $true -pathToArtifacts ${{parameters.PathToArtifacts}} -accessLevel "public" -tag "${{parameters.AdditionalTag}}" -registry ${{parameters.Registry}} -npmToken $(azure-sdk-npm-token)
+              pwsh: true
+            condition: succeeded()
 
   - ${{ else }}:
       - task: PowerShell@2

diff --git a/eng/tools/publish-to-npm.ps1 b/eng/tools/publish-to-npm.ps1
@@ -167,7 +167,9 @@ try {
                 Write-Host "npm dist-tag add $nameAndVersion $tag"
                 npm dist-tag add $nameAndVersion $tag
             }
-            if ($additionalTag -ne "" && $additionalTag -ne $tag) {
+            if (![string]::IsNullOrWhitespace($additionalTag) -and ($additionalTag -ne $tag)) {
+                Write-Host "Tag: '$tag'"
+                Write-Host "Additional tag: '$additionalTag'"
                 Write-Host "Adding additional tag for package"
                 Write-Host "npm dist-tag add $nameAndVersion $additionalTag"
                 npm dist-tag add $nameAndVersion $additionalTag