Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set version 2.1 #503

Merged
merged 4 commits into from
Jan 8, 2025
Merged

Set version 2.1 #503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
30a7e9f
Set version 2.1.0
dzikowski Jan 8, 2025
d8a461e
Add VSC config to gitignore
dzikowski Jan 8, 2025
5152724
Merge remote-tracking branch 'origin/main' into set-version-2.1
dzikowski Jan 8, 2025
015cecb
NPM audit fix
dzikowski Jan 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ fablo-target
generators
node_modules
.idea
.vscode
samples/invalid-fablo-config.json
8 changes: 4 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ You may keep the script in the root directory of your project or install it glob
To install it globally:

```bash
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
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
```

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

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

## Getting started
Expand Down Expand Up @@ -344,7 +344,7 @@ The basic structure of Fablo config file is as follows:

```json
{
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.0.0/schema.json",
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.1.0/schema.json",
"global": { ... },
"orgs": [ ... ],
"channels": [ ... ],
Expand Down Expand Up @@ -507,7 +507,7 @@ Genrated Hooks are saved in `fablo-target/hooks`.

```yaml
---
"$schema": https://github.com/hyperledger-labs/fablo/releases/download/2.0.0/schema.json
"$schema": https://github.com/hyperledger-labs/fablo/releases/download/2.1.0/schema.json
global:
fabricVersion: 2.4.2
tls: false
Expand Down
4 changes: 2 additions & 2 deletions bump-version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ include_readme=true
ver_arg="${1:-unstable}"

if [ "$ver_arg" = "patch" ] || [ "$ver_arg" = "minor" ] || [ "$ver_arg" = "major" ]; then
new_version=$(semver "$old_version" -i "$ver_arg")
new_version=$(semver next "$ver_arg" "$old_version")
elif [ "$ver_arg" = "unstable" ]; then
new_version=$(semver "$old_version" -i prerelease --preid unstable)
new_version="$(semver next patch "$old_version")-unstable"
include_readme=false
elif [ "$ver_arg" = "set" ]; then
new_version="$2"
Expand Down
2 changes: 1 addition & 1 deletion docs/sample.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.0.0/schema.json",
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.1.0/schema.json",
"global": {
"fabricVersion": "2.3.2",
"tls": false,
Expand Down
2 changes: 1 addition & 1 deletion docs/schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
],
"properties": {
"$schema": {
"const": "https://github.com/hyperledger-labs/fablo/releases/download/2.0.0/schema.json"
"const": "https://github.com/hyperledger-labs/fablo/releases/download/2.1.0/schema.json"
},
"global": {
"$id": "#/properties/global",
Expand Down
2 changes: 1 addition & 1 deletion e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-k8s.json.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ exports[`samples/fablo-config-hlf2-1org-1chaincode-k8s.json should create proper
REPOSITORY="https://kfsoftware.github.io/hlf-helm-charts"
STORAGE_CLASS=$(kubectl describe sc | grep Name | tr -s ' ' | cut -d ':' -f 2 | cut -d ' ' -f 2)

FABLO_VERSION=2.0.0
FABLO_VERSION=2.1.0
FABLO_BUILD=<date with git hash>
FABLO_CONFIG=<absolute path>
ORDERER_IMAGE=hyperledger/fabric-orderer
Expand Down
2 changes: 1 addition & 1 deletion e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-raft-explorer.json.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1524,7 +1524,7 @@ fi
`;

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`] = `
"FABLO_VERSION=2.0.0
"FABLO_VERSION=2.1.0
FABLO_BUILD=<date with git hash>
FABLO_REST_VERSION=0.1.2
HYPERLEDGER_EXPLORER_VERSION=1.1.8
Expand Down
2 changes: 1 addition & 1 deletion e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode.json.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1435,7 +1435,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=2.0.0
"FABLO_VERSION=2.1.0
FABLO_BUILD=<date with git hash>
FABLO_REST_VERSION=0.1.2
HYPERLEDGER_EXPLORER_VERSION=1.1.8
Expand Down
2 changes: 1 addition & 1 deletion e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2096,7 +2096,7 @@ fi
`;

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`] = `
"FABLO_VERSION=2.0.0
"FABLO_VERSION=2.1.0
FABLO_BUILD=<date with git hash>
FABLO_REST_VERSION=0.1.2
HYPERLEDGER_EXPLORER_VERSION=1.1.8
Expand Down
2 changes: 1 addition & 1 deletion e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3019,7 +3019,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=2.0.0
"FABLO_VERSION=2.1.0
FABLO_BUILD=<date with git hash>
FABLO_REST_VERSION=0.1.2
HYPERLEDGER_EXPLORER_VERSION=1.1.8
Expand Down
2 changes: 1 addition & 1 deletion e2e/__snapshots__/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3314,7 +3314,7 @@ fi
`;

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`] = `
"FABLO_VERSION=2.0.0
"FABLO_VERSION=2.1.0
FABLO_BUILD=<date with git hash>
FABLO_REST_VERSION=0.1.2
HYPERLEDGER_EXPLORER_VERSION=1.1.8
Expand Down
2 changes: 1 addition & 1 deletion e2e/__snapshots__/fablo-config-hlf3-1orgs-1chaincode.json.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1507,7 +1507,7 @@ fi
`;

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`] = `
"FABLO_VERSION=2.0.0
"FABLO_VERSION=2.1.0
FABLO_BUILD=<date with git hash>
FABLO_REST_VERSION=0.1.2
HYPERLEDGER_EXPLORER_VERSION=1.1.8
Expand Down
2 changes: 1 addition & 1 deletion e2e/__snapshots__/fablo-config-hlf3-bft-1orgs-1chaincode.json.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1533,7 +1533,7 @@ fi
`;

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`] = `
"FABLO_VERSION=2.0.0
"FABLO_VERSION=2.1.0
FABLO_BUILD=<date with git hash>
FABLO_REST_VERSION=0.1.2
HYPERLEDGER_EXPLORER_VERSION=1.1.8
Expand Down
6 changes: 3 additions & 3 deletions e2e/__snapshots__/fabloCommands.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2965,7 +2965,7 @@ Validation warnings count: 0

exports[`init should init simple fablo config 1`] = `
"{
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.0.0/schema.json",
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.1.0/schema.json",
"global": {
"fabricVersion": "2.5.9",
"tls": false,
Expand Down Expand Up @@ -3019,7 +3019,7 @@ exports[`init should init simple fablo config 1`] = `

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

exports[`init should init simple fablo config with node chaincode and rest api 1`] = `
"{
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.0.0/schema.json",
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.1.0/schema.json",
"global": {
"fabricVersion": "2.5.9",
"tls": false,
Expand Down
2 changes: 1 addition & 1 deletion e2e/__snapshots__/schema.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ exports[`schema should match snapshot 1`] = `
"default": {},
"properties": {
"$schema": {
"const": "https://github.com/hyperledger-labs/fablo/releases/download/2.0.0/schema.json",
"const": "https://github.com/hyperledger-labs/fablo/releases/download/2.1.0/schema.json",
},
"chaincodes": {
"$id": "#/properties/chaincodes",
Expand Down
2 changes: 1 addition & 1 deletion fablo.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -e

FABLO_VERSION=2.0.0
FABLO_VERSION=2.1.0
FABLO_IMAGE_NAME="ghcr.io/fablo-io/fablo"
FABLO_IMAGE="$FABLO_IMAGE_NAME:$FABLO_VERSION"

Expand Down
30 changes: 16 additions & 14 deletions package-lock.json
View file
Open in desktop

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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "generator-fablo",
"version": "2.0.0",
"version": "2.1.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
2 changes: 1 addition & 1 deletion samples/fablo-config-hlf2-1org-1chaincode-k8s.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.0.0/schema.json",
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.1.0/schema.json",
"global": {
"fabricVersion": "2.4.7",
"tls": false,
Expand Down
2 changes: 1 addition & 1 deletion samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.0.0/schema.json",
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.1.0/schema.json",
"global": {
"fabricVersion": "2.3.3",
"tls": true,
Expand Down
2 changes: 1 addition & 1 deletion samples/fablo-config-hlf2-1org-1chaincode.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.0.0/schema.json",
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.1.0/schema.json",
"global": {
"fabricVersion": "2.5.9",
"tls": false
Expand Down
2 changes: 1 addition & 1 deletion samples/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
"$schema": https://github.com/hyperledger-labs/fablo/releases/download/2.0.0/schema.json
"$schema": https://github.com/hyperledger-labs/fablo/releases/download/2.1.0/schema.json
global:
fabricVersion: 2.4.7
tls: false
Expand Down
2 changes: 1 addition & 1 deletion samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
"$schema": https://github.com/hyperledger-labs/fablo/releases/download/2.0.0/schema.json
"$schema": https://github.com/hyperledger-labs/fablo/releases/download/2.1.0/schema.json
global:
fabricVersion: 2.4.3
tls: true
Expand Down
2 changes: 1 addition & 1 deletion samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.0.0/schema.json",
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.1.0/schema.json",
"global": {
"fabricVersion": "2.3.2",
"tls": true,
Expand Down
2 changes: 1 addition & 1 deletion samples/fablo-config-hlf3-1orgs-1chaincode.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.0.0/schema.json",
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.1.0/schema.json",
"global": {
"fabricVersion": "3.0.0-beta",
"tls": true,
Expand Down
2 changes: 1 addition & 1 deletion samples/fablo-config-hlf3-bft-1orgs-1chaincode.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.0.0/schema.json",
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.1.0/schema.json",
"global": {
"fabricVersion": "3.0.0-beta",
"tls": true,
Expand Down
Loading