CI Pipeline Fixes (#304)

- Update build-data.yaml to fail if the subshell's fail - Move to use the docker/fabric-nodeenv image's package.json. Inline with the version used for the docker image Signed-off-by: Matthew B White <[email protected]>
hyperledger · Nov 29, 2021 · 8acc32a · 8acc32a
1 parent 5a4d075
commit 8acc32a
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/ci/templates/build-data.yaml b/ci/templates/build-data.yaml
@@ -1,13 +1,17 @@
 steps:
 - script: |
+    #!/bin/bash
+    set -ex -o pipefail
+
     env | sort
+    
     # handle full version number
-    VERSION=$(jq '.version' $(Build.SourcesDirectory)/package.json | sed -r "s/\"([0-9]?[0-9]\.[0-9]?[0-9]\.[0-9]?[0-9]).*/\1/")
+    VERSION=$(jq '.version' $(Build.SourcesDirectory)/docker/fabric-nodeenv/package.json | sed -r "s/\"([0-9]?[0-9]\.[0-9]?[0-9]\.[0-9]?[0-9]).*/\1/")
     echo Current version in code is :${VERSION}:
     echo "##vso[task.setvariable variable=PACKAGE_VERSION;isOutput=true]${VERSION}"
     
     # handle minor version
-    MINOR_VERSION=$(jq '.version' $(Build.SourcesDirectory)/package.json | sed -r "s/\"([0-9]?[0-9]\.[0-9]?[0-9])\.[0-9]?[0-9].*/\1/")
+    MINOR_VERSION=$(jq '.version' $(Build.SourcesDirectory)/docker/fabric-nodeenv/package.json | sed -r "s/\"([0-9]?[0-9]\.[0-9]?[0-9])\.[0-9]?[0-9].*/\1/")
     echo Current minor version in code is :${MINOR_VERSION}:
     echo "##vso[task.setvariable variable=MINOR_PACKAGE_VERSION;isOutput=true]${MINOR_VERSION}"