use single publish script (#1118)

Signed-off-by: nkl199@yahoo.co.uk <nkl199@yahoo.co.uk>
hyperledger · Jan 6, 2021 · 369d11e · 369d11e
1 parent c48f9ad
commit 369d11e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 42 deletions.
diff --git a/.build/publish-docker.sh → .build/publish-caliper.sh b/.build/publish-docker.sh → .build/publish-caliper.sh
@@ -25,4 +25,5 @@ cp ./README.md ./packages/caliper-fisco-bcos/README.md
 
 cd ./packages/caliper-publish/
 npm i
+./publish.js npm
 ./publish.js docker --publish
diff --git a/.build/publish-npm.sh b/.build/publish-npm.sh
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -104,26 +104,16 @@ stages:
     # having a blind succeeded here will not work if a preceding stage was skipped
     condition: and(not(failed('UnitTests')), eq(variables['Build.Reason'], 'IndividualCI'))
     jobs:
-      - job: PublishNPM
-        displayName: "Publish Caliper NPM packages"
+      - job: PublishCaliper
+        displayName: "Publish Caliper to NPM and DockerHub"
         steps:
           - task: NodeTool@0
             inputs:
               versionSpec: "10.x"
             displayName: "Install Node.js"
-          - script: .build/publish-npm.sh
-            displayName: Publish packages
+          - script: .build/publish-caliper.sh
+            displayName: Publish Caliper
             env:
               NPM_TOKEN: "$(npm)"
-      - job: PublishDocker
-        displayName: "Publish Caliper Docker images"
-        steps:
-          - task: NodeTool@0
-            inputs:
-              versionSpec: "10.x"
-            displayName: "Install Node.js"
-          - script: .build/publish-docker.sh
-            displayName: Publish packages
-            env:
               DOCKER_USER: "$(DockerHub-Username)"
               DOCKER_TOKEN: "$(DockerHub-Password)"