Skip to content

Commit

Permalink
prepare version 0.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Jakub Dzikowski committed Sep 17, 2021
1 parent 919e523 commit 89f0229
Show file tree
Hide file tree
Showing 23 changed files with 26 additions and 31 deletions.
5 changes: 0 additions & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
## 0.3.0-unstable
### Features
### Fixes
### Chore & Maintenance

## 0.2.0
* Rename Fabrica to Fablo

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ The basic structure of Fablo config file is as follows:
```json
{
"$schema": "https://github.com/softwaremill/fablo/releases/download/0.3.0-unstable/schema.json",
"$schema": "https://github.com/softwaremill/fablo/releases/download/0.2.0/schema.json",
"networkSettings": { ... },
"rootOrg": { ... },
"orgs": [ ... ],
Expand Down Expand Up @@ -359,7 +359,7 @@ The `privateData` parameter is optional. You don't need to define the private da
```yaml
---
"$schema": https://github.com/softwaremill/fablo/releases/download/0.3.0-unstable/schema.json
"$schema": https://github.com/softwaremill/fablo/releases/download/0.2.0/schema.json
networkSettings:
fabricVersion: 2.3.0
tls: false
Expand Down
2 changes: 1 addition & 1 deletion docs/sample.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://github.com/softwaremill/fablo/releases/download/0.3.0-unstable/schema.json",
"$schema": "https://github.com/softwaremill/fablo/releases/download/0.2.0/schema.json",
"networkSettings": {
"fabricVersion": "2.3.2",
"tls": false
Expand Down
2 changes: 1 addition & 1 deletion docs/schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
],
"properties": {
"$schema": {
"const": "https://github.com/softwaremill/fablo/releases/download/0.3.0-unstable/schema.json"
"const": "https://github.com/softwaremill/fablo/releases/download/0.2.0/schema.json"
},
"networkSettings": {
"$id": "#/properties/networkSettings",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ fi
`;
exports[`samples/fablo-config-hlf1.3-2orgs-1chaincode-private-data.json should create proper e2e/__tmp__/samples/fablo-config-hlf1.3-2orgs-1chaincode-private-data.json.tmpdir/fablo-target/fabric-docker/.env from samples/fablo-config-hlf1.3-2orgs-1chaincode-private-data.json 1`] = `
"FABLO_VERSION=\\"0.3.0-unstable\\"
"FABLO_VERSION=\\"0.2.0\\"
FABLO_BUILD=<date with git hash>
FABLO_CONFIG=<absolute path>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ fi
`;
exports[`samples/fablo-config-hlf1.4-1org-1chaincode-raft.json should create proper e2e/__tmp__/samples/fablo-config-hlf1.4-1org-1chaincode-raft.json.tmpdir/fablo-target/fabric-docker/.env from samples/fablo-config-hlf1.4-1org-1chaincode-raft.json 1`] = `
"FABLO_VERSION=\\"0.3.0-unstable\\"
"FABLO_VERSION=\\"0.2.0\\"
FABLO_BUILD=<date with git hash>
FABLO_CONFIG=<absolute path>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ fi
`;
exports[`samples/fablo-config-hlf1.4-2orgs-1chaincode.json should create proper e2e/__tmp__/samples/fablo-config-hlf1.4-2orgs-1chaincode.json.tmpdir/fablo-target/fabric-docker/.env from samples/fablo-config-hlf1.4-2orgs-1chaincode.json 1`] = `
"FABLO_VERSION=\\"0.3.0-unstable\\"
"FABLO_VERSION=\\"0.2.0\\"
FABLO_BUILD=<date with git hash>
FABLO_CONFIG=<absolute path>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ fi
`;
exports[`samples/fablo-config-hlf1.4-2orgs-2chaincodes-private-data.yaml should create proper e2e/__tmp__/samples/fablo-config-hlf1.4-2orgs-2chaincodes-private-data.yaml.tmpdir/fablo-target/fabric-docker/.env from samples/fablo-config-hlf1.4-2orgs-2chaincodes-private-data.yaml 1`] = `
"FABLO_VERSION=\\"0.3.0-unstable\\"
"FABLO_VERSION=\\"0.2.0\\"
FABLO_BUILD=<date with git hash>
FABLO_CONFIG=<absolute path>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ fi
`;
exports[`samples/fablo-config-hlf1.4-2orgs-2chaincodes-raft.json should create proper e2e/__tmp__/samples/fablo-config-hlf1.4-2orgs-2chaincodes-raft.json.tmpdir/fablo-target/fabric-docker/.env from samples/fablo-config-hlf1.4-2orgs-2chaincodes-raft.json 1`] = `
"FABLO_VERSION=\\"0.3.0-unstable\\"
"FABLO_VERSION=\\"0.2.0\\"
FABLO_BUILD=<date with git hash>
FABLO_CONFIG=<absolute path>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ fi
`;
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`] = `
"FABLO_VERSION=\\"0.3.0-unstable\\"
"FABLO_VERSION=\\"0.2.0\\"
FABLO_BUILD=<date with git hash>
FABLO_CONFIG=<absolute path>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ fi
`;
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`] = `
"FABLO_VERSION=\\"0.3.0-unstable\\"
"FABLO_VERSION=\\"0.2.0\\"
FABLO_BUILD=<date with git hash>
FABLO_CONFIG=<absolute path>
Expand Down
8 changes: 4 additions & 4 deletions e2e/__snapshots__/fabloCommands.test.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ exports[`extend config should extend custom config 1`] = `
\`--. \\\\/ _ \\\\| _| __\\\\ \\\\ /\\\\ / / _\` | '__/ _ \\\\ |\\\\/| | | | |
/\\\\__/ / (_) | | | |_ \\\\ V V / (_| | | | __/ | | | | | |
\\\\____/ \\\\___/|_| \\\\__| \\\\_/\\\\_/ \\\\__,_|_| \\\\___\\\\_| |_/_|_|_|
=========================================================== v: 0.3.0-unstable
=========================================================== v: 0.2.0
Validation errors count: 0
Validation warnings count: 0
===========================================================
Expand Down Expand Up @@ -1128,7 +1128,7 @@ exports[`extend config should extend default config 1`] = `
\`--. \\\\/ _ \\\\| _| __\\\\ \\\\ /\\\\ / / _\` | '__/ _ \\\\ |\\\\/| | | | |
/\\\\__/ / (_) | | | |_ \\\\ V V / (_| | | | __/ | | | | | |
\\\\____/ \\\\___/|_| \\\\__| \\\\_/\\\\_/ \\\\__,_|_| \\\\___\\\\_| |_/_|_|_|
=========================================================== v: 0.3.0-unstable
=========================================================== v: 0.2.0
Validation errors count: 0
Validation warnings count: 0
===========================================================
Expand Down Expand Up @@ -1385,7 +1385,7 @@ Validation warnings count: 0

exports[`init should init simple fablo config 1`] = `
"{
\\"$schema\\": \\"https://github.com/softwaremill/fablo/releases/download/0.3.0-unstable/schema.json\\",
\\"$schema\\": \\"https://github.com/softwaremill/fablo/releases/download/0.2.0/schema.json\\",
\\"networkSettings\\": {
\\"fabricVersion\\": \\"2.3.2\\",
\\"tls\\": false
Expand Down Expand Up @@ -1432,7 +1432,7 @@ exports[`init should init simple fablo config 1`] = `

exports[`init should init simple fablo config with node chaincode 1`] = `
"{
\\"$schema\\": \\"https://github.com/softwaremill/fablo/releases/download/0.3.0-unstable/schema.json\\",
\\"$schema\\": \\"https://github.com/softwaremill/fablo/releases/download/0.2.0/schema.json\\",
\\"networkSettings\\": {
\\"fabricVersion\\": \\"2.3.2\\",
\\"tls\\": false
Expand Down
2 changes: 1 addition & 1 deletion e2e/__snapshots__/schema.test.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Object {
"default": Object {},
"properties": Object {
"$schema": Object {
"const": "https://github.com/softwaremill/fablo/releases/download/0.3.0-unstable/schema.json",
"const": "https://github.com/softwaremill/fablo/releases/download/0.2.0/schema.json",
},
"chaincodes": Object {
"$id": "#/properties/chaincodes",
Expand Down
2 changes: 1 addition & 1 deletion fablo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -e

FABLO_VERSION="0.3.0-unstable"
FABLO_VERSION="0.2.0"
FABLO_IMAGE_NAME="softwaremill/fablo"
FABLO_IMAGE="$FABLO_IMAGE_NAME:$FABLO_VERSION"

Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "generator-fablo",
"version": "0.3.0-unstable",
"version": "0.2.0",
"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.",
"author": "Piotr Hejwowski <[email protected]>, Jakub Dzikowski <[email protected]>",
"repository": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://github.com/softwaremill/fablo/releases/download/0.3.0-unstable/schema.json",
"$schema": "https://github.com/softwaremill/fablo/releases/download/0.2.0/schema.json",
"networkSettings": {
"fabricVersion": "1.3.0",
"tls": false
Expand Down
2 changes: 1 addition & 1 deletion samples/fablo-config-hlf1.4-1org-1chaincode-raft.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://github.com/softwaremill/fablo/releases/download/0.3.0-unstable/schema.json",
"$schema": "https://github.com/softwaremill/fablo/releases/download/0.2.0/schema.json",
"networkSettings": {
"fabricVersion": "1.4.6",
"tls": true,
Expand Down
2 changes: 1 addition & 1 deletion samples/fablo-config-hlf1.4-2orgs-1chaincode.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://github.com/softwaremill/fablo/releases/download/0.3.0-unstable/schema.json",
"$schema": "https://github.com/softwaremill/fablo/releases/download/0.2.0/schema.json",
"networkSettings": {
"fabricVersion": "1.4.6",
"tls": false
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
"$schema": https://github.com/softwaremill/fablo/releases/download/0.3.0-unstable/schema.json
"$schema": https://github.com/softwaremill/fablo/releases/download/0.2.0/schema.json
networkSettings:
fabricVersion: 1.4.11
tls: false
Expand Down
2 changes: 1 addition & 1 deletion samples/fablo-config-hlf1.4-2orgs-2chaincodes-raft.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://github.com/softwaremill/fablo/releases/download/0.3.0-unstable/schema.json",
"$schema": "https://github.com/softwaremill/fablo/releases/download/0.2.0/schema.json",
"networkSettings": {
"fabricVersion": "1.4.6",
"tls": true
Expand Down
2 changes: 1 addition & 1 deletion samples/fablo-config-hlf2-1org-1chaincode.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://github.com/softwaremill/fablo/releases/download/0.3.0-unstable/schema.json",
"$schema": "https://github.com/softwaremill/fablo/releases/download/0.2.0/schema.json",
"networkSettings": {
"fabricVersion": "2.3.2",
"tls": false
Expand Down
2 changes: 1 addition & 1 deletion samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
"$schema": https://github.com/softwaremill/fablo/releases/download/0.3.0-unstable/schema.json
"$schema": https://github.com/softwaremill/fablo/releases/download/0.2.0/schema.json
networkSettings:
fabricVersion: 2.3.1
tls: true
Expand Down

0 comments on commit 89f0229

Please sign in to comment.