Skip to content

Commit

Permalink
Merge pull request #414 from dzikowski/bump-version-script
Browse files Browse the repository at this point in the history
Create bump version script and bump version
  • Loading branch information
dzikowski authored Oct 13, 2023
2 parents 831ec24 + ca9cf95 commit 5fbc6bf
Show file tree
Hide file tree
Showing 29 changed files with 75 additions and 34 deletions.
8 changes: 4 additions & 4 deletions README.md
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/1.1.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/1.2.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/1.1.0/fablo.sh -o ./fablo && chmod +x ./fablo
curl -Lf https://github.com/hyperledger-labs/fablo/releases/download/1.2.0/fablo.sh -o ./fablo && chmod +x ./fablo
```

## Getting started
Expand Down Expand Up @@ -325,7 +325,7 @@ The basic structure of Fablo config file is as follows:
```json
{
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.1.0/schema.json",
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.0/schema.json",
"global": { ... },
"orgs": [ ... ],
"channels": [ ... ],
Expand Down Expand Up @@ -488,7 +488,7 @@ Genrated Hooks are saved in `fablo-target/hooks`.
```yaml
---
"$schema": https://github.com/hyperledger-labs/fablo/releases/download/1.1.0/schema.json
"$schema": https://github.com/hyperledger-labs/fablo/releases/download/1.2.0/schema.json
global:
fabricVersion: 2.4.2
tls: false
Expand Down
41 changes: 41 additions & 0 deletions bump-version.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
#!/usr/bin/env bash

set -eu

old_version=$(< package.json jq -r '.version')
ver_arg="${1:-unstable}"

if [ "$ver_arg" = "patch" ] || [ "$ver_arg" = "minor" ] || [ "$ver_arg" = "major" ]; then
new_version=$(semver "$old_version" -i "$ver_arg")
elif [ "$ver_arg" = "unstable" ]; then
new_version=$(semver "$old_version" -i prerelease --preid unstable)
else
echo "Invalid version parameter: $ver_arg"
echo "Usage: $0 [patch|minor|major|unstable]"
exit 1
fi

echo "Updating version from $old_version to $new_version"
echo -n " - package.json... "
npm version "$new_version" --no-git-tag-version > /dev/null
echo "done"

echo -n " - FABLO_VERSION... "
perl -i -pe "s/FABLO_VERSION=.*\\n/FABLO_VERSION=${new_version}\\n/g" fablo.sh
perl -i -pe "s/FABLO_VERSION=.*\\n/FABLO_VERSION=${new_version}\\n/g" e2e/__snapshots__/*
echo "done"

echo -n " - JSON schema URL... "
schema_update_pattern="s/download\/[0-9-.a-zA-Z]*\/schema.json/download\/${new_version}\/schema.json/g"
#perl -i -pe "$schema_update_pattern" README.md
perl -i -pe "$schema_update_pattern" docs/sample.json
perl -i -pe "$schema_update_pattern" docs/schema.json
perl -i -pe "$schema_update_pattern" samples/*.json
perl -i -pe "$schema_update_pattern" samples/*.yaml
perl -i -pe "$schema_update_pattern" e2e/__snapshots__/*
echo "done"

echo -n " - download URL... "
download_update_pattern="s/download\/[0-9-.a-zA-Z]*\/fablo.sh/download\/${new_version}\/fablo.sh/g"
#perl -i -pe "$download_update_pattern" README.md
echo "done"
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/hyperledger-labs/fablo/releases/download/1.2.0/schema.json",
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.1-unstable.0/schema.json",
"global": {
"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 @@ -12,7 +12,7 @@
],
"properties": {
"$schema": {
"const": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.0/schema.json"
"const": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.1-unstable.0/schema.json"
},
"global": {
"$id": "#/properties/global",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2086,7 +2086,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=1.2.0
"FABLO_VERSION=1.2.1-unstable.0
FABLO_BUILD=<date with git hash>
FABLO_REST_VERSION=0.1.0
HYPERLEDGER_EXPLORER_VERSION=1.1.8
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1497,7 +1497,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=1.2.0
"FABLO_VERSION=1.2.1-unstable.0
FABLO_BUILD=<date with git hash>
FABLO_REST_VERSION=0.1.0
HYPERLEDGER_EXPLORER_VERSION=1.1.8
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2112,7 +2112,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=1.2.0
"FABLO_VERSION=1.2.1-unstable.0
FABLO_BUILD=<date with git hash>
FABLO_REST_VERSION=0.1.0
HYPERLEDGER_EXPLORER_VERSION=1.1.8
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2093,7 +2093,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=1.2.0
"FABLO_VERSION=1.2.1-unstable.0
FABLO_BUILD=<date with git hash>
FABLO_REST_VERSION=0.1.0
HYPERLEDGER_EXPLORER_VERSION=1.1.8
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2283,7 +2283,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=1.2.0
"FABLO_VERSION=1.2.1-unstable.0
FABLO_BUILD=<date with git hash>
FABLO_REST_VERSION=0.1.0
HYPERLEDGER_EXPLORER_VERSION=1.1.8
Expand Down
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=1.2.0
FABLO_VERSION=1.2.1-unstable.0
FABLO_BUILD=<date with git hash>
FABLO_CONFIG=<absolute path>
ORDERER_IMAGE=hyperledger/fabric-orderer
Expand Down
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=1.2.0
"FABLO_VERSION=1.2.1-unstable.0
FABLO_BUILD=<date with git hash>
FABLO_REST_VERSION=0.1.0
HYPERLEDGER_EXPLORER_VERSION=1.1.8
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1434,7 +1434,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=1.2.0
"FABLO_VERSION=1.2.1-unstable.0
FABLO_BUILD=<date with git hash>
FABLO_REST_VERSION=0.1.0
HYPERLEDGER_EXPLORER_VERSION=1.1.8
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3021,7 +3021,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=1.2.0
"FABLO_VERSION=1.2.1-unstable.0
FABLO_BUILD=<date with git hash>
FABLO_REST_VERSION=0.1.0
HYPERLEDGER_EXPLORER_VERSION=1.1.8
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3316,7 +3316,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=1.2.0
"FABLO_VERSION=1.2.1-unstable.0
FABLO_BUILD=<date with git hash>
FABLO_REST_VERSION=0.1.0
HYPERLEDGER_EXPLORER_VERSION=1.1.8
Expand Down
6 changes: 3 additions & 3 deletions e2e/__snapshots__/fabloCommands.test.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -2907,7 +2907,7 @@ Validation warnings count: 0

exports[`init should init simple fablo config 1`] = `
"{
\\"$schema\\": \\"https://github.com/hyperledger-labs/fablo/releases/download/1.2.0/schema.json\\",
\\"$schema\\": \\"https://github.com/hyperledger-labs/fablo/releases/download/1.2.1-unstable.0/schema.json\\",
\\"global\\": {
\\"fabricVersion\\": \\"2.4.7\\",
\\"tls\\": false,
Expand Down Expand Up @@ -2961,7 +2961,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/1.2.0/schema.json\\",
\\"$schema\\": \\"https://github.com/hyperledger-labs/fablo/releases/download/1.2.1-unstable.0/schema.json\\",
\\"global\\": {
\\"fabricVersion\\": \\"2.4.7\\",
\\"tls\\": false,
Expand Down Expand Up @@ -3023,7 +3023,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/1.2.0/schema.json\\",
\\"$schema\\": \\"https://github.com/hyperledger-labs/fablo/releases/download/1.2.1-unstable.0/schema.json\\",
\\"global\\": {
\\"fabricVersion\\": \\"2.4.7\\",
\\"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 @@ -7,7 +7,7 @@ Object {
"default": Object {},
"properties": Object {
"$schema": Object {
"const": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.0/schema.json",
"const": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.1-unstable.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="1.2.0"
FABLO_VERSION=1.2.1-unstable.0
FABLO_IMAGE_NAME="softwaremill/fablo"
FABLO_IMAGE="$FABLO_IMAGE_NAME:$FABLO_VERSION"

Expand Down
4 changes: 2 additions & 2 deletions 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": "1.2.0",
"version": "1.2.1-unstable.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/hyperledger-labs/fablo/releases/download/1.2.0/schema.json",
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.1-unstable.0/schema.json",
"global": {
"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/hyperledger-labs/fablo/releases/download/1.2.0/schema.json",
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.1-unstable.0/schema.json",
"global": {
"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/hyperledger-labs/fablo/releases/download/1.2.0/schema.json",
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.1-unstable.0/schema.json",
"global": {
"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/hyperledger-labs/fablo/releases/download/1.2.0/schema.json
"$schema": https://github.com/hyperledger-labs/fablo/releases/download/1.2.1-unstable.0/schema.json
global:
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/hyperledger-labs/fablo/releases/download/1.2.0/schema.json",
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.1-unstable.0/schema.json",
"global": {
"fabricVersion": "1.4.6",
"tls": true
Expand Down
2 changes: 1 addition & 1 deletion samples/fablo-config-hlf2-1org-1chaincode-k8s.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.0/schema.json",
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.1-unstable.0/schema.json",
"global": {
"fabricVersion": "2.4.7",
"tls": false,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.0/schema.json",
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.1-unstable.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
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.0/schema.json",
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.1-unstable.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
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
"$schema": https://github.com/hyperledger-labs/fablo/releases/download/1.2.0/schema.json
"$schema": https://github.com/hyperledger-labs/fablo/releases/download/1.2.1-unstable.0/schema.json
global:
fabricVersion: 2.4.3
tls: true
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.0/schema.json",
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.1-unstable.0/schema.json",
"global": {
"fabricVersion": "2.3.2",
"tls": true,
Expand Down

0 comments on commit 5fbc6bf

Please sign in to comment.