Update to new version

Update to the .github workflows to handle the branch rename. Signed-off-by: Matthew B White <whitemat@uk.ibm.com>
hyperledger · Mar 17, 2023 · 7d865af · 7d865af
1 parent 220ac53
commit 7d865af
Show file tree

Hide file tree

Showing 24 changed files with 65 additions and 63 deletions.
diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml
@@ -7,7 +7,6 @@ on:
   pull_request:
     branches:
       - main
-      - release-2.5
   workflow_dispatch:
 
 concurrency:

diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml
@@ -7,7 +7,6 @@ on:
   push:
     branches:
       - main
-      - release-2.5
   workflow_dispatch:
 
 jobs:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.5.3
+Tue Mar  7 09:36:52 GMT 2023
+
+
 ## v2.5.2
 Wed Jan 25 14:21:32 GMT 2023
 

diff --git a/apis/fabric-contract-api/package.json b/apis/fabric-contract-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fabric-contract-api",
-  "version": "2.5.3-unstable",
+  "version": "2.5.3",
   "tag": "unstable",
   "description": "A node.js implementation of Hyperledger Fabric chaincode shim, to allow endorsing peers and user-provided chaincodes to communicate with each other",
   "main": "index.js",
@@ -22,7 +22,7 @@
     "Fabric Shim"
   ],
   "engines": {
-    "node": "^18.0.0"    
+    "node": "^18.0.0"
   },
   "license": "Apache-2.0",
   "types": "./types/index.d.ts",
@@ -45,7 +45,7 @@
     "lines": 100
   },
   "dependencies": {
-    "fabric-shim-api": "2.5.3-unstable",
+    "fabric-shim-api": "2.5.3",
     "class-transformer": "^0.4.0",
     "fast-safe-stringify": "^2.1.1",
     "get-params": "^0.1.2",

diff --git a/apis/fabric-shim-api/package.json b/apis/fabric-shim-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fabric-shim-api",
-  "version": "2.5.3-unstable",
+  "version": "2.5.3",
   "tag": "unstable",
   "description": "A node.js API of Hyperledger Fabric chaincode shim, to allow endorsing peers and user-provided chaincodes to communicate with each other",
   "main": "index.js",

diff --git a/docker/fabric-nodeenv/package.json b/docker/fabric-nodeenv/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fabric-nodeenv",
-  "version": "2.5.3-unstable",
+  "version": "2.5.3",
   "description": "",
   "main": "docker.js",
   "scripts": {
@@ -11,6 +11,6 @@
   "license": "Apache-2.0",
   "dependencies": {
     "git-rev-sync": "3.0.1",
-    "toolchain": "2.5.3-unstable"
+    "toolchain": "2.5.3"
   }
 }
diff --git a/docs/package.json b/docs/package.json
@@ -1,14 +1,14 @@
 {
   "name": "fabric-shim-docs",
-  "version": "2.5.3-unstable",
+  "version": "2.5.3",
   "description": "",
   "private": true,
   "scripts": {
     "build": "npm run docs",
     "docs": "rimraf ./gen && jsdoc -c ./_jsdoc.json"
   },
   "dependencies": {
-    "fabric-ledger": "2.5.3-unstable"
+    "fabric-ledger": "2.5.3"
   },
   "devDependencies": {
     "ink-docstrap": "^1.3.2",

diff --git a/libraries/fabric-ledger/package.json b/libraries/fabric-ledger/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fabric-ledger",
-  "version": "2.5.3-unstable",
+  "version": "2.5.3",
   "tag": "unstable",
   "description": "A node.js implementation of Hyperledger Fabric ledger api, to allow access to ledger data from smart contracts",
   "main": "lib/index.js",
@@ -23,7 +23,7 @@
     "Fabric Ledger"
   ],
   "engines": {
-    "node": "^18.0.0"    
+    "node": "^18.0.0"
   },
   "license": "Apache-2.0",
   "nyc": {
@@ -48,7 +48,7 @@
     "lines": 100
   },
   "dependencies": {
-    "fabric-contract-api": "2.5.3-unstable",
+    "fabric-contract-api": "2.5.3",
     "winston": "^3.7.2"
   },
   "devDependencies": {

diff --git a/libraries/fabric-shim/package.json b/libraries/fabric-shim/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fabric-shim",
-  "version": "2.5.3-unstable",
+  "version": "2.5.3",
   "tag": "unstable",
   "description": "A node.js implementation of Hyperledger Fabric chaincode shim, to allow endorsing peers and user-provided chaincodes to communicate with each other",
   "main": "index.js",
@@ -29,7 +29,7 @@
     "Fabric Shim"
   ],
   "engines": {
-    "node": "^18.0.0"    
+    "node": "^18.0.0"
   },
   "types": "./types/index.d.ts",
   "license": "Apache-2.0",
@@ -59,8 +59,8 @@
     "@hyperledger/fabric-protos": "0.1.0-dev.2300102001.1",
     "@types/node": "^16.11.1",
     "ajv": "^6.12.2",
-    "fabric-contract-api": "2.5.3-unstable",
-    "fabric-shim-api": "2.5.3-unstable",
+    "fabric-contract-api": "2.5.3",
+    "fabric-shim-api": "2.5.3",
     "fast-safe-stringify": "^2.1.1",
     "fs-extra": "^10.0.1",
     "reflect-metadata": "^0.1.13",

diff --git a/test/chaincodes/annotations/package.json b/test/chaincodes/annotations/package.json
@@ -13,13 +13,13 @@
   "typings": "dist/index.d.ts",
   "engine-strict": true,
   "engineStrict": true,
-  "version": "2.5.3-unstable",
+  "version": "2.5.3",
   "author": "",
   "license": "APACHE-2.0",
   "dependencies": {
     "@types/node": "^16.11.4",
-    "fabric-contract-api": "2.5.3-unstable",
-    "fabric-shim": "2.5.3-unstable",
+    "fabric-contract-api": "2.5.3",
+    "fabric-shim": "2.5.3",
     "ts-node": "^3.3.0",
     "tslint": "^5.6.0",
     "typescript": "^4.0.2"

diff --git a/test/chaincodes/annotations/src/test_contract/expected-metadata.json b/test/chaincodes/annotations/src/test_contract/expected-metadata.json
@@ -107,7 +107,7 @@
         }
     },
     "info": {
-        "version": "2.5.3-unstable",
+        "version": "2.5.3",
         "title": "ts_chaincode"
     },
     "components": {

diff --git a/test/chaincodes/clientidentity/package.json b/test/chaincodes/clientidentity/package.json
@@ -10,11 +10,11 @@
   "main": "index.js",
   "engine-strict": true,
   "engineStrict": true,
-  "version": "2.5.3-unstable",
+  "version": "2.5.3",
   "author": "",
   "license": "Apache-2.0",
   "dependencies": {
-    "fabric-shim": "2.5.3-unstable",
-    "fabric-contract-api": "2.5.3-unstable"
+    "fabric-shim": "2.5.3",
+    "fabric-contract-api": "2.5.3"
   }
 }
diff --git a/test/chaincodes/crosschaincode/package.json b/test/chaincodes/crosschaincode/package.json
@@ -10,11 +10,11 @@
   "main": "index.js",
   "engine-strict": true,
   "engineStrict": true,
-  "version": "2.5.3-unstable",
+  "version": "2.5.3",
   "author": "",
   "license": "Apache-2.0",
   "dependencies": {
-    "fabric-shim": "2.5.3-unstable",
-    "fabric-contract-api": "2.5.3-unstable"
+    "fabric-shim": "2.5.3",
+    "fabric-contract-api": "2.5.3"
   }
 }
diff --git a/test/chaincodes/crosschaincode2/package.json b/test/chaincodes/crosschaincode2/package.json
@@ -2,19 +2,19 @@
   "name": "chaincode",
   "description": "Chaincode testing cross chaincode functionality",
   "engines": {
-    "node": "^18.0.0"    
+    "node": "^18.0.0"
   },
   "scripts": {
     "start": "fabric-chaincode-node start"
   },
   "main": "index.js",
   "engine-strict": true,
   "engineStrict": true,
-  "version": "2.5.3-unstable",
+  "version": "2.5.3",
   "author": "",
   "license": "Apache-2.0",
   "dependencies": {
-    "fabric-shim": "2.5.3-unstable",
-    "fabric-contract-api": "2.5.3-unstable"
+    "fabric-shim": "2.5.3",
+    "fabric-contract-api": "2.5.3"
   }
 }
diff --git a/test/chaincodes/crud/package.json b/test/chaincodes/crud/package.json
@@ -2,19 +2,19 @@
   "name": "chaincode",
   "description": "Chaincode testing crud functionality",
   "engines": {
-    "node": "^18.0.0"    
+    "node": "^18.0.0"
   },
   "scripts": {
     "start": "set -x && CORE_CHAINCODE_LOGGING_LEVEL=debug fabric-chaincode-node start"
   },
   "main": "index.js",
   "engine-strict": true,
   "engineStrict": true,
-  "version": "2.5.3-unstable",
+  "version": "2.5.3",
   "author": "",
   "license": "Apache-2.0",
   "dependencies": {
-    "fabric-shim": "2.5.3-unstable",
-    "fabric-contract-api": "2.5.3-unstable"
+    "fabric-shim": "2.5.3",
+    "fabric-contract-api": "2.5.3"
   }
 }
diff --git a/test/chaincodes/events/package.json b/test/chaincodes/events/package.json
@@ -2,19 +2,19 @@
   "name": "chaincode",
   "description": "Chaincode testing events functionality",
   "engines": {
-    "node": "^18.0.0"    
+    "node": "^18.0.0"
   },
   "scripts": {
     "start": "set -x && CORE_CHAINCODE_LOGGING_LEVEL=debug fabric-chaincode-node start"
   },
   "main": "index.js",
   "engine-strict": true,
   "engineStrict": true,
-  "version": "2.5.3-unstable",
+  "version": "2.5.3",
   "author": "",
   "license": "Apache-2.0",
   "dependencies": {
-    "fabric-shim": "2.5.3-unstable",
-    "fabric-contract-api": "2.5.3-unstable"
+    "fabric-shim": "2.5.3",
+    "fabric-contract-api": "2.5.3"
   }
 }
diff --git a/test/chaincodes/ledger/package.json b/test/chaincodes/ledger/package.json
@@ -2,20 +2,20 @@
   "name": "chaincode",
   "description": "Chaincode testing ledger functionality",
   "engines": {
-    "node": "^18.0.0"    
+    "node": "^18.0.0"
   },
   "scripts": {
     "start": "fabric-chaincode-node start"
   },
   "main": "index.js",
   "engine-strict": true,
   "engineStrict": true,
-  "version": "2.5.3-unstable",
+  "version": "2.5.3",
   "author": "",
   "license": "Apache-2.0",
   "dependencies": {
-    "fabric-shim": "2.5.3-unstable",
-    "fabric-contract-api": "2.5.3-unstable",
-    "fabric-ledger": "2.5.3-unstable"
+    "fabric-shim": "2.5.3",
+    "fabric-contract-api": "2.5.3",
+    "fabric-ledger": "2.5.3"
   }
 }
diff --git a/test/chaincodes/privateData/package.json b/test/chaincodes/privateData/package.json
@@ -11,11 +11,11 @@
   "main": "index.js",
   "engine-strict": true,
   "engineStrict": true,
-  "version": "2.5.3-unstable",
+  "version": "2.5.3",
   "author": "",
   "license": "Apache-2.0",
   "dependencies": {
-    "fabric-shim": "2.5.3-unstable",
-    "fabric-contract-api": "2.5.3-unstable"
+    "fabric-shim": "2.5.3",
+    "fabric-contract-api": "2.5.3"
   }
 }
diff --git a/test/chaincodes/query/package.json b/test/chaincodes/query/package.json
@@ -2,19 +2,19 @@
   "name": "chaincode",
   "description": "Chaincode testing query functionality",
   "engines": {
-    "node": "^18.0.0"    
+    "node": "^18.0.0"
   },
   "scripts": {
     "start": "fabric-chaincode-node start"
   },
   "main": "index.js",
   "engine-strict": true,
   "engineStrict": true,
-  "version": "2.5.3-unstable",
+  "version": "2.5.3",
   "author": "",
   "license": "Apache-2.0",
   "dependencies": {
-    "fabric-shim": "2.5.3-unstable",
-    "fabric-contract-api": "2.5.3-unstable"
+    "fabric-shim": "2.5.3",
+    "fabric-contract-api": "2.5.3"
   }
 }
diff --git a/test/chaincodes/scenario/package.json b/test/chaincodes/scenario/package.json
@@ -10,11 +10,11 @@
   "main": "index.js",
   "engine-strict": true,
   "engineStrict": true,
-  "version": "2.5.3-unstable",
+  "version": "2.5.3",
   "author": "",
   "license": "Apache-2.0",
   "dependencies": {
-    "fabric-shim": "2.5.3-unstable",
-    "fabric-contract-api": "2.5.3-unstable"
+    "fabric-shim": "2.5.3",
+    "fabric-contract-api": "2.5.3"
   }
 }
diff --git a/test/e2e/package.json b/test/e2e/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fabric-e2e-tests",
-  "version": "2.5.3-unstable",
+  "version": "2.5.3",
   "description": "",
   "main": "docker.js",
   "scripts": {
@@ -13,7 +13,7 @@
   "devDependencies": {
     "git-rev-sync": "3.0.1",
     "gulp": "^4.0.2",
-    "toolchain": "2.5.3-unstable",
+    "toolchain": "2.5.3",
     "delay": "5.0.0",
     "fs-extra": "^10.0.1",
     "ip": "^1.1.5",

diff --git a/test/e2e/scenario.js b/test/e2e/scenario.js
@@ -57,7 +57,7 @@ const queryFunctions = async () => {
 
     const metadata = JSON.parse(stdout);
 
-    const expectedMetadata = '{"$schema":"https://hyperledger.github.io/fabric-chaincode-node/main/api/contract-schema.json","contracts":{"UpdateValues":{"name":"UpdateValues","contractInstance":{"name":"UpdateValues","logBuffer":{"output":[]},"default":true},"transactions":[{"name":"setup","tags":["SUBMIT","submitTx"]},{"name":"setNewAssetValue","tags":["SUBMIT","submitTx"],"parameters":[{"name":"arg0","description":"Argument 0","schema":{"type":"string"}}]},{"name":"doubleAssetValue","tags":["SUBMIT","submitTx"]}],"info":{"title":"","version":""}},"RemoveValues":{"name":"RemoveValues","contractInstance":{"name":"RemoveValues"},"transactions":[{"name":"quarterAssetValue","tags":["SUBMIT","submitTx"]},{"name":"getAssetValue","tags":["SUBMIT","submitTx"]}],"info":{"title":"","version":""}},"org.hyperledger.fabric":{"name":"org.hyperledger.fabric","contractInstance":{"name":"org.hyperledger.fabric"},"transactions":[{"name":"GetMetadata"}],"info":{"title":"","version":""}}},"info":{"version":"2.5.3-unstable","title":"chaincode"},"components":{"schemas":{}}}';
+    const expectedMetadata = '{"$schema":"https://hyperledger.github.io/fabric-chaincode-node/main/api/contract-schema.json","contracts":{"UpdateValues":{"name":"UpdateValues","contractInstance":{"name":"UpdateValues","logBuffer":{"output":[]},"default":true},"transactions":[{"name":"setup","tags":["SUBMIT","submitTx"]},{"name":"setNewAssetValue","tags":["SUBMIT","submitTx"],"parameters":[{"name":"arg0","description":"Argument 0","schema":{"type":"string"}}]},{"name":"doubleAssetValue","tags":["SUBMIT","submitTx"]}],"info":{"title":"","version":""}},"RemoveValues":{"name":"RemoveValues","contractInstance":{"name":"RemoveValues"},"transactions":[{"name":"quarterAssetValue","tags":["SUBMIT","submitTx"]},{"name":"getAssetValue","tags":["SUBMIT","submitTx"]}],"info":{"title":"","version":""}},"org.hyperledger.fabric":{"name":"org.hyperledger.fabric","contractInstance":{"name":"org.hyperledger.fabric"},"transactions":[{"name":"GetMetadata"}],"info":{"title":"","version":""}}},"info":{"version":"2.5.3","title":"chaincode"},"components":{"schemas":{}}}';
 
     const schema = fs.readFileSync(path.join(__dirname, '../../apis/fabric-contract-api/schema/contract-schema.json'));