Skip to content

Commit e248186

Browse files
committed
Update fabricToolsVersion to 3.0.0-beta in configuration snapshots and extendGlobal logic
Signed-off-by: Jakub Dzikowski <jakub.t.dzikowski@gmail.com>
1 parent 89e0a59 commit e248186

File tree

5 files changed

+9
-5
lines changed

5 files changed

+9
-5
lines changed

e2e/__snapshots__/extendConfig.test.ts.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9812,7 +9812,7 @@ exports[`extend config samples/fablo-config-hlf3-1orgs-1chaincode.json 1`] = `
98129812
"fabricJavaenvVersion": "2.5",
98139813
"fabricNodeenvVersion": "2.5",
98149814
"fabricRecommendedNodeVersion": "16",
9815-
"fabricToolsVersion": "2.5",
9815+
"fabricToolsVersion": "3.0.0-beta",
98169816
"fabricVersion": "3.0.0",
98179817
"monitoring": {
98189818
"loglevel": "debug",
@@ -10770,7 +10770,7 @@ exports[`extend config samples/fablo-config-hlf3-bft-1orgs-1chaincode.json 1`] =
1077010770
"fabricJavaenvVersion": "2.5",
1077110771
"fabricNodeenvVersion": "2.5",
1077210772
"fabricRecommendedNodeVersion": "16",
10773-
"fabricToolsVersion": "2.5",
10773+
"fabricToolsVersion": "3.0.0-beta",
1077410774
"fabricVersion": "3.0.0",
1077510775
"monitoring": {
1077610776
"loglevel": "debug",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1522,7 +1522,7 @@ COMPOSE_PROJECT_NAME=<name with timestamp>
15221522
LOGGING_LEVEL=debug
15231523
15241524
FABRIC_VERSION=3.0.0
1525-
FABRIC_TOOLS_VERSION=2.5
1525+
FABRIC_TOOLS_VERSION=3.0.0-beta
15261526
FABRIC_CA_VERSION=1.5.5
15271527
FABRIC_CA_POSTGRES_VERSION=14
15281528
FABRIC_CCENV_VERSION=3.0.0

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1548,7 +1548,7 @@ COMPOSE_PROJECT_NAME=<name with timestamp>
15481548
LOGGING_LEVEL=debug
15491549
15501550
FABRIC_VERSION=3.0.0
1551-
FABRIC_TOOLS_VERSION=2.5
1551+
FABRIC_TOOLS_VERSION=3.0.0-beta
15521552
FABRIC_CA_VERSION=1.5.5
15531553
FABRIC_CA_POSTGRES_VERSION=14
15541554
FABRIC_CCENV_VERSION=3.0.0

e2e/__snapshots__/fabloCommands.test.ts.snap

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ exports[`extend config should extend custom config 1`] = `
44
"Validation errors count: 0
55
Validation warnings count: 0
66
===========================================================
7+
Could not check for updates. Url: 'https://api.github.com/repos/hyperledger-labs/fablo/releases' not available
78
{
89
"global": {
910
"fabricVersion": "2.4.3",
@@ -2471,6 +2472,7 @@ exports[`extend config should extend default config 1`] = `
24712472
"Validation errors count: 0
24722473
Validation warnings count: 0
24732474
===========================================================
2475+
Could not check for updates. Url: 'https://api.github.com/repos/hyperledger-labs/fablo/releases' not available
24742476
{
24752477
"global": {
24762478
"fabricVersion": "2.5.9",

src/extend-config/extendGlobal.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,11 @@ const getVersions = (fabricVersion: string): FabricVersions => {
2424

2525
const below3_0_0 = (v: string) => (v.startsWith("3.") ? "2.5" : v);
2626

27+
const beta3_0_0 = (v: string) => (v.startsWith("3.0.") ? "3.0.0-beta" : v);
28+
2729
return {
2830
fabricVersion,
29-
fabricToolsVersion: below3_0_0(fabricVersion),
31+
fabricToolsVersion: beta3_0_0(fabricVersion),
3032
fabricCaVersion: version(fabricVersion).isGreaterOrEqual("1.4.10") ? "1.5.5" : fabricVersion,
3133
fabricCcenvVersion: fabricVersion,
3234
fabricBaseosVersion: version(fabricVersion).isGreaterOrEqual("2.0") ? fabricVersion : "0.4.9",

0 commit comments

Comments
 (0)