Merge bbcfde6 into 90117f9

Azure · Mar 25, 2021 · ba23fd7 · ba23fd7
2 parents 90117f9 + bbcfde6
commit ba23fd7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/eng/pipelines/templates/stages/archetype-js-release.yml b/eng/pipelines/templates/stages/archetype-js-release.yml
@@ -85,7 +85,7 @@ stages:
                         inputs:
                           targetType: filePath
                           filePath: "eng/tools/publish-to-npm.ps1"
-                          arguments: '-pathToArtifacts $(Package.Archive) -accessLevel "public" -tag $(Tag) -additionalTag "$(AdditionalTag)" -registry ${{parameters.Registry}} -npmToken $(azure-sdk-npm-token)'
+                          arguments: '-pathToArtifacts $(Package.Archive) -accessLevel "public" -tag $env:Tag -additionalTag $env:AdditionalTag -registry ${{parameters.Registry}} -npmToken $(azure-sdk-npm-token)'
                           pwsh: true
 
           - ${{if ne(artifact.skipPublishDocMs, 'true')}}:

diff --git a/eng/tools/publish-to-npm.ps1 b/eng/tools/publish-to-npm.ps1
@@ -1,7 +1,7 @@
 param (
   $pathToArtifacts,
   $accessLevel,
-  $tag,
+  $tag="",
   $additionalTag="",
   $registry,
   $npmToken,
@@ -124,8 +124,17 @@ try {
 
     foreach ($p in $packageList) {
         if($p.Publish) {
-            Write-Host "npm publish $($p.TarGz) --access=$accessLevel --registry=$registry --always-auth=true --tag=$tag"
-            npm publish $p.TarGz --access=$accessLevel --registry=$registry --always-auth=true --tag=$tag
+            if ($tag)
+            {
+              Write-Host "npm publish $($p.TarGz) --access=$accessLevel --registry=$registry --always-auth=true --tag=$tag"
+              npm publish $p.TarGz --access=$accessLevel --registry=$registry --always-auth=true --tag=$tag
+            }
+            else
+            {
+              Write-Host "npm publish $($p.TarGz) --access=$accessLevel --registry=$registry --always-auth=true"
+              npm publish $p.TarGz --access=$accessLevel --registry=$registry --always-auth=true
+            }
+
             if ($LastExitCode -ne 0) {
                 Write-Host "npm publish failed with exit code $LastExitCode"
                 exit 1