Use github.com/hyperledger/fabric-protos repo

- Update proto source - Rewrite common.proto to work around bug in protobufjs FABN-1355 #done Change-Id: If9dc0dcc2ba3ddda07dc7bc68cb4e4d2f52eba04 Signed-off-by: Matthew Sykes <[email protected]>
hyperledger · Aug 26, 2019 · be841fe · be841fe
1 parent b06fda4
commit be841fe
Show file tree

Hide file tree

Showing 43 changed files with 513 additions and 1,773 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -64,16 +64,17 @@ def buildStages() {
             env.GOROOT = "/opt/go/go" + props["GO_VER"] + ".linux." + "$MARCH"
             env.GOPATH = "$GOPATH/bin"
             env.PATH = "$GOROOT/bin:$GOPATH/bin:$PATH"
-            // Clone fabric repository
+            // Clone fabric repositories
             fabBuildLibrary.cloneScm('fabric', '$GERRIT_BRANCH')
+            fabBuildLibrary.cloneScm('fabric-protos', '$GERRIT_BRANCH')
             // Build fabric images
             fabBuildLibrary.fabBuildImages('fabric', 'docker')
             // Clone fabric-ca repository
             fabBuildLibrary.cloneScm('fabric-ca', '$GERRIT_BRANCH')
             // Build fabric-ca docker images
             fabBuildLibrary.fabBuildImages('fabric-ca', 'docker')
             // Pull Docker Images from nexus3
-              fabBuildLibrary.pullDockerImages(props["FAB_BASE_VERSION"], props["FAB_IMAGES_LIST"])
+            fabBuildLibrary.pullDockerImages(props["FAB_BASE_VERSION"], props["FAB_IMAGES_LIST"])
             // Pull Thirdparty Docker Images from hyperledger DockerHub
             fabBuildLibrary.pullThirdPartyImages(props["FAB_BASEIMAGE_VERSION"], props["FAB_THIRDPARTY_IMAGES_LIST"])
           } else {