Skip to content

Commit 005686d

Browse files
dzikowskidzikowski
authored
Merge pull request #503 from hyperledger-labs/set-version-2.1
Set version 2.1
2 parents e1bffe4 + 015cecb commit 005686d

26 files changed

+47
-44
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ fablo-target
55
generators
66
node_modules
77
.idea
8+
.vscode
89
samples/invalid-fablo-config.json

‎README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ You may keep the script in the root directory of your project or install it glob
2323
To install it globally:
2424

2525
```bash
26-
sudo curl -Lf https://github.com/hyperledger-labs/fablo/releases/download/2.0.0/fablo.sh -o /usr/local/bin/fablo && sudo chmod +x /usr/local/bin/fablo
26+
sudo curl -Lf https://github.com/hyperledger-labs/fablo/releases/download/2.1.0/fablo.sh -o /usr/local/bin/fablo && sudo chmod +x /usr/local/bin/fablo
2727
```
2828

2929
To get a copy of Fablo for a single project, execute in the project root:
3030

3131
```bash
32-
curl -Lf https://github.com/hyperledger-labs/fablo/releases/download/2.0.0/fablo.sh -o ./fablo && chmod +x ./fablo
32+
curl -Lf https://github.com/hyperledger-labs/fablo/releases/download/2.1.0/fablo.sh -o ./fablo && chmod +x ./fablo
3333
```
3434

3535
## Getting started
@@ -344,7 +344,7 @@ The basic structure of Fablo config file is as follows:
344344
345345
```json
346346
{
347-
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.0.0/schema.json",
347+
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.1.0/schema.json",
348348
"global": { ... },
349349
"orgs": [ ... ],
350350
"channels": [ ... ],
@@ -507,7 +507,7 @@ Genrated Hooks are saved in `fablo-target/hooks`.
507507
508508
```yaml
509509
---
510-
"$schema": https://github.com/hyperledger-labs/fablo/releases/download/2.0.0/schema.json
510+
"$schema": https://github.com/hyperledger-labs/fablo/releases/download/2.1.0/schema.json
511511
global:
512512
fabricVersion: 2.4.2
513513
tls: false

‎bump-version.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ include_readme=true
77
ver_arg="${1:-unstable}"
88

99
if [ "$ver_arg" = "patch" ] || [ "$ver_arg" = "minor" ] || [ "$ver_arg" = "major" ]; then
10-
new_version=$(semver "$old_version" -i "$ver_arg")
10+
new_version=$(semver next "$ver_arg" "$old_version")
1111
elif [ "$ver_arg" = "unstable" ]; then
12-
new_version=$(semver "$old_version" -i prerelease --preid unstable)
12+
new_version="$(semver next patch "$old_version")-unstable"
1313
include_readme=false
1414
elif [ "$ver_arg" = "set" ]; then
1515
new_version="$2"

‎docs/sample.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.0.0/schema.json",
2+
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.1.0/schema.json",
33
"global": {
44
"fabricVersion": "2.3.2",
55
"tls": false,

‎docs/schema.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
],
1313
"properties": {
1414
"$schema": {
15-
"const": "https://github.com/hyperledger-labs/fablo/releases/download/2.0.0/schema.json"
15+
"const": "https://github.com/hyperledger-labs/fablo/releases/download/2.1.0/schema.json"
1616
},
1717
"global": {
1818
"$id": "#/properties/global",

‎e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-k8s.json.test.ts.snap

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ exports[`samples/fablo-config-hlf2-1org-1chaincode-k8s.json should create proper
8686
REPOSITORY="https://kfsoftware.github.io/hlf-helm-charts"
8787
STORAGE_CLASS=$(kubectl describe sc | grep Name | tr -s ' ' | cut -d ':' -f 2 | cut -d ' ' -f 2)
8888
89-
FABLO_VERSION=2.0.0
89+
FABLO_VERSION=2.1.0
9090
FABLO_BUILD=<date with git hash>
9191
FABLO_CONFIG=<absolute path>
9292
ORDERER_IMAGE=hyperledger/fabric-orderer

‎e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-raft-explorer.json.test.ts.snap

+1-1
Original file line numberDiff line numberDiff line change
@@ -1524,7 +1524,7 @@ fi
15241524
`;
15251525
15261526
exports[`samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.json should create proper e2e/__tmp__/samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.json.tmpdir/fablo-target/fabric-docker/.env from samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.json 1`] = `
1527-
"FABLO_VERSION=2.0.0
1527+
"FABLO_VERSION=2.1.0
15281528
FABLO_BUILD=<date with git hash>
15291529
FABLO_REST_VERSION=0.1.2
15301530
HYPERLEDGER_EXPLORER_VERSION=1.1.8

‎e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode.json.test.ts.snap

+1-1
Original file line numberDiff line numberDiff line change
@@ -1435,7 +1435,7 @@ fi
14351435
`;
14361436
14371437
exports[`samples/fablo-config-hlf2-1org-1chaincode.json should create proper e2e/__tmp__/samples/fablo-config-hlf2-1org-1chaincode.json.tmpdir/fablo-target/fabric-docker/.env from samples/fablo-config-hlf2-1org-1chaincode.json 1`] = `
1438-
"FABLO_VERSION=2.0.0
1438+
"FABLO_VERSION=2.1.0
14391439
FABLO_BUILD=<date with git hash>
14401440
FABLO_REST_VERSION=0.1.2
14411441
HYPERLEDGER_EXPLORER_VERSION=1.1.8

‎e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml.test.ts.snap

+1-1
Original file line numberDiff line numberDiff line change
@@ -2096,7 +2096,7 @@ fi
20962096
`;
20972097
20982098
exports[`samples/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml should create proper e2e/__tmp__/samples/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml.tmpdir/fablo-target/fabric-docker/.env from samples/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml 1`] = `
2099-
"FABLO_VERSION=2.0.0
2099+
"FABLO_VERSION=2.1.0
21002100
FABLO_BUILD=<date with git hash>
21012101
FABLO_REST_VERSION=0.1.2
21022102
HYPERLEDGER_EXPLORER_VERSION=1.1.8

‎e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.test.ts.snap

+1-1
Original file line numberDiff line numberDiff line change
@@ -3019,7 +3019,7 @@ fi
30193019
`;
30203020
30213021
exports[`samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml should create proper e2e/__tmp__/samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.tmpdir/fablo-target/fabric-docker/.env from samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`] = `
3022-
"FABLO_VERSION=2.0.0
3022+
"FABLO_VERSION=2.1.0
30233023
FABLO_BUILD=<date with git hash>
30243024
FABLO_REST_VERSION=0.1.2
30253025
HYPERLEDGER_EXPLORER_VERSION=1.1.8

‎e2e/__snapshots__/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json.test.ts.snap

+1-1
Original file line numberDiff line numberDiff line change
@@ -3314,7 +3314,7 @@ fi
33143314
`;
33153315
33163316
exports[`samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json should create proper e2e/__tmp__/samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json.tmpdir/fablo-target/fabric-docker/.env from samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json 1`] = `
3317-
"FABLO_VERSION=2.0.0
3317+
"FABLO_VERSION=2.1.0
33183318
FABLO_BUILD=<date with git hash>
33193319
FABLO_REST_VERSION=0.1.2
33203320
HYPERLEDGER_EXPLORER_VERSION=1.1.8

‎e2e/__snapshots__/fablo-config-hlf3-1orgs-1chaincode.json.test.ts.snap

+1-1
Original file line numberDiff line numberDiff line change
@@ -1507,7 +1507,7 @@ fi
15071507
`;
15081508
15091509
exports[`samples/fablo-config-hlf3-1orgs-1chaincode.json should create proper e2e/__tmp__/samples/fablo-config-hlf3-1orgs-1chaincode.json.tmpdir/fablo-target/fabric-docker/.env from samples/fablo-config-hlf3-1orgs-1chaincode.json 1`] = `
1510-
"FABLO_VERSION=2.0.0
1510+
"FABLO_VERSION=2.1.0
15111511
FABLO_BUILD=<date with git hash>
15121512
FABLO_REST_VERSION=0.1.2
15131513
HYPERLEDGER_EXPLORER_VERSION=1.1.8

‎e2e/__snapshots__/fablo-config-hlf3-bft-1orgs-1chaincode.json.test.ts.snap

+1-1
Original file line numberDiff line numberDiff line change
@@ -1533,7 +1533,7 @@ fi
15331533
`;
15341534
15351535
exports[`samples/fablo-config-hlf3-bft-1orgs-1chaincode.json should create proper e2e/__tmp__/samples/fablo-config-hlf3-bft-1orgs-1chaincode.json.tmpdir/fablo-target/fabric-docker/.env from samples/fablo-config-hlf3-bft-1orgs-1chaincode.json 1`] = `
1536-
"FABLO_VERSION=2.0.0
1536+
"FABLO_VERSION=2.1.0
15371537
FABLO_BUILD=<date with git hash>
15381538
FABLO_REST_VERSION=0.1.2
15391539
HYPERLEDGER_EXPLORER_VERSION=1.1.8

‎e2e/__snapshots__/fabloCommands.test.ts.snap

+3-3
Original file line numberDiff line numberDiff line change
@@ -2965,7 +2965,7 @@ Validation warnings count: 0
29652965

29662966
exports[`init should init simple fablo config 1`] = `
29672967
"{
2968-
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.0.0/schema.json",
2968+
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.1.0/schema.json",
29692969
"global": {
29702970
"fabricVersion": "2.5.9",
29712971
"tls": false,
@@ -3019,7 +3019,7 @@ exports[`init should init simple fablo config 1`] = `
30193019

30203020
exports[`init should init simple fablo config with node chaincode 1`] = `
30213021
"{
3022-
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.0.0/schema.json",
3022+
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.1.0/schema.json",
30233023
"global": {
30243024
"fabricVersion": "2.5.9",
30253025
"tls": false,
@@ -3081,7 +3081,7 @@ exports[`init should init simple fablo config with node chaincode 1`] = `
30813081

30823082
exports[`init should init simple fablo config with node chaincode and rest api 1`] = `
30833083
"{
3084-
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.0.0/schema.json",
3084+
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.1.0/schema.json",
30853085
"global": {
30863086
"fabricVersion": "2.5.9",
30873087
"tls": false,

‎e2e/__snapshots__/schema.test.ts.snap

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ exports[`schema should match snapshot 1`] = `
77
"default": {},
88
"properties": {
99
"$schema": {
10-
"const": "https://github.com/hyperledger-labs/fablo/releases/download/2.0.0/schema.json",
10+
"const": "https://github.com/hyperledger-labs/fablo/releases/download/2.1.0/schema.json",
1111
},
1212
"chaincodes": {
1313
"$id": "#/properties/chaincodes",

‎fablo.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -e
44

5-
FABLO_VERSION=2.0.0
5+
FABLO_VERSION=2.1.0
66
FABLO_IMAGE_NAME="ghcr.io/fablo-io/fablo"
77
FABLO_IMAGE="$FABLO_IMAGE_NAME:$FABLO_VERSION"
88

‎package-lock.json

+16-14
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "generator-fablo",
3-
"version": "2.0.0",
3+
"version": "2.1.0",
44
"description": "Fablo is a simple tool to generate the Hyperledger Fabric blockchain network and run it on Docker. It supports RAFT and solo consensus protocols, multiple organizations and channels, chaincode installation and upgrade.",
55
"author": "Piotr Hejwowski <[email protected]>, Jakub Dzikowski <[email protected]>",
66
"repository": {

‎samples/fablo-config-hlf2-1org-1chaincode-k8s.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.0.0/schema.json",
2+
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.1.0/schema.json",
33
"global": {
44
"fabricVersion": "2.4.7",
55
"tls": false,

‎samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.0.0/schema.json",
2+
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.1.0/schema.json",
33
"global": {
44
"fabricVersion": "2.3.3",
55
"tls": true,

‎samples/fablo-config-hlf2-1org-1chaincode.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.0.0/schema.json",
2+
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.1.0/schema.json",
33
"global": {
44
"fabricVersion": "2.5.9",
55
"tls": false

‎samples/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
"$schema": https://github.com/hyperledger-labs/fablo/releases/download/2.0.0/schema.json
2+
"$schema": https://github.com/hyperledger-labs/fablo/releases/download/2.1.0/schema.json
33
global:
44
fabricVersion: 2.4.7
55
tls: false

‎samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
"$schema": https://github.com/hyperledger-labs/fablo/releases/download/2.0.0/schema.json
2+
"$schema": https://github.com/hyperledger-labs/fablo/releases/download/2.1.0/schema.json
33
global:
44
fabricVersion: 2.4.3
55
tls: true

‎samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.0.0/schema.json",
2+
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.1.0/schema.json",
33
"global": {
44
"fabricVersion": "2.3.2",
55
"tls": true,

‎samples/fablo-config-hlf3-1orgs-1chaincode.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.0.0/schema.json",
2+
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.1.0/schema.json",
33
"global": {
44
"fabricVersion": "3.0.0-beta",
55
"tls": true,

‎samples/fablo-config-hlf3-bft-1orgs-1chaincode.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.0.0/schema.json",
2+
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.1.0/schema.json",
33
"global": {
44
"fabricVersion": "3.0.0-beta",
55
"tls": true,

0 commit comments

Comments
 (0)