Skip to content

Commit 0c43fcf

Browse files
dzikowskidzikowski
authored
Merge branch 'main' into test-gateway-ci
2 parents 1f6d969 + 661f6ec commit 0c43fcf

11 files changed

+39
-35
lines changed

‎.github/workflows/test-on-push.yml‎

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -172,25 +172,28 @@ jobs:
172172
173173
test-05-v3:
174174
needs: test-main
175-
runs-on: macos-15
175+
runs-on: macos-13
176176
steps:
177177
- name: Check out repository code
178178
uses: actions/checkout@v2
179179

180-
- name: Install Docker + Colima
180+
- name: Fix Python conflicts between macOS runner and Homebrew
181181
run: |
182-
brew update
183-
brew install qemu colima docker
184-
brew uninstall --ignore-dependencies lima
185-
curl https://raw.githubusercontent.com/Homebrew/homebrew-core/45464b6c4788a80be3f131ab5e2a4468cdfa960c/Formula/l/lima.rb > lima.rb
186-
brew install lima.rb
187-
LIMACTL_PATH=$(brew --prefix)/bin/limactl
188-
sudo curl -L -o $LIMACTL_PATH https://github.com/mikekazakov/lima-nohvf/raw/master/limactl
189-
sudo chmod +x $LIMACTL_PATH
190-
colima start --network-address --arch arm64 --vm-type=qemu
191-
mkdir -p ~/.docker/cli-plugins
192-
brew install docker-compose
193-
ln -sfn $(brew --prefix)/opt/docker-compose/bin/docker-compose ~/.docker/cli-plugins/docker-compose
182+
# see https://github.com/actions/setup-python/issues/577
183+
brew list -1 | grep python | while read formula; do brew unlink $formula; brew link --overwrite $formula; done
184+
185+
- name: Install homebrew dependencies
186+
run: |
187+
set -x
188+
sudo chmod ugo+w /usr/local/bin
189+
brew install docker docker-compose lima qemu
190+
191+
- name: Install and start Colima
192+
run: |
193+
brew install colima
194+
colima version
195+
colima start --cpu 3 --memory 6 --disk 100 --vm-type=qemu --mount-type=sshfs --dns=1.1.1.1
196+
colima restart
194197
195198
- name: Install dependencies
196199
run: |

‎e2e-network/docker/test-04-v2-snapshot.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ waitForContainer "ca.org1.example.com" "Listening on https://0.0.0.0:7054"
5656
waitForContainer "couchdb.peer0.org1.example.com" "Apache CouchDB has started. Time to relax."
5757
waitForContainer "peer0.org1.example.com" "Joining gossip network of channel my-channel1 with 1 organizations"
5858
waitForContainer "db.explorer.example.com" "database system is ready to accept connections" "200"
59-
waitForContainer "explorer.example.com" "Successfully created channel event hub for \[my-channel1\]" "200"
6059
waitForChaincode "peer0.org1.example.com" "my-channel1" "chaincode1" "0.0.1"
6160

6261
fablo_rest_org1="localhost:8801"
@@ -113,6 +112,8 @@ hook_command="perl -i -pe 's/FABRIC_VERSION=2\.3\.3/FABRIC_VERSION=2\.4\.2/g' ./
113112
"$FABLO_HOME/fablo.sh" restore "$snapshot_name" "$hook_command" &&
114113
"$FABLO_HOME/fablo.sh" start
115114
)
115+
116+
waitForContainer "explorer.example.com" "Successfully created channel event hub for \[my-channel1\]" "200"
116117
waitForChaincode "peer0.org1.example.com" "my-channel1" "chaincode1" "0.0.1"
117118

118119
sleep 5

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1527,7 +1527,7 @@ exports[`samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.json should cre
15271527
"FABLO_VERSION=2.2.0
15281528
FABLO_BUILD=<date with git hash>
15291529
FABLO_REST_VERSION=0.1.2
1530-
HYPERLEDGER_EXPLORER_VERSION=1.1.8
1530+
HYPERLEDGER_EXPLORER_VERSION=2.0.0
15311531
15321532
COUCHDB_VERSION=3.1
15331533
FABRIC_COUCHDB_VERSION=0.4.18
@@ -2121,14 +2121,14 @@ services:
21212121
- basic
21222122
21232123
db.explorer.example.com:
2124-
image: hyperledger/explorer-db:\${HYPERLEDGER_EXPLORER_VERSION}
2124+
image: ghcr.io/hyperledger-labs/explorer-db:\${HYPERLEDGER_EXPLORER_VERSION}
21252125
container_name: db.explorer.example.com
21262126
environment:
21272127
- DATABASE_DATABASE=fabricexplorer
21282128
- DATABASE_USERNAME=hppoc
21292129
- DATABASE_PASSWORD=password
21302130
healthcheck:
2131-
test: "pg_isready -h localhost -p 5432 -q -U postgres"
2131+
test: "pg_isready -h localhost -p 5432 -q -U hppoc -d fabricexplorer"
21322132
interval: 5s
21332133
timeout: 10s
21342134
retries: 7
@@ -2138,7 +2138,7 @@ services:
21382138
- basic
21392139
21402140
explorer.example.com:
2141-
image: hyperledger/explorer:\${HYPERLEDGER_EXPLORER_VERSION}
2141+
image: ghcr.io/hyperledger-labs/explorer:\${HYPERLEDGER_EXPLORER_VERSION}
21422142
restart: on-failure:8
21432143
container_name: explorer.example.com
21442144
environment:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1438,7 +1438,7 @@ exports[`samples/fablo-config-hlf2-1org-1chaincode.json should create proper e2e
14381438
"FABLO_VERSION=2.2.0
14391439
FABLO_BUILD=<date with git hash>
14401440
FABLO_REST_VERSION=0.1.2
1441-
HYPERLEDGER_EXPLORER_VERSION=1.1.8
1441+
HYPERLEDGER_EXPLORER_VERSION=2.0.0
14421442
14431443
COUCHDB_VERSION=3.1
14441444
FABRIC_COUCHDB_VERSION=0.4.18

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2099,7 +2099,7 @@ exports[`samples/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml should cr
20992099
"FABLO_VERSION=2.2.0
21002100
FABLO_BUILD=<date with git hash>
21012101
FABLO_REST_VERSION=0.1.2
2102-
HYPERLEDGER_EXPLORER_VERSION=1.1.8
2102+
HYPERLEDGER_EXPLORER_VERSION=2.0.0
21032103
21042104
COUCHDB_VERSION=3.1
21052105
FABRIC_COUCHDB_VERSION=0.4.18

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3022,7 +3022,7 @@ exports[`samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml should create pro
30223022
"FABLO_VERSION=2.2.0
30233023
FABLO_BUILD=<date with git hash>
30243024
FABLO_REST_VERSION=0.1.2
3025-
HYPERLEDGER_EXPLORER_VERSION=1.1.8
3025+
HYPERLEDGER_EXPLORER_VERSION=2.0.0
30263026
30273027
COUCHDB_VERSION=3.1
30283028
FABRIC_COUCHDB_VERSION=0.4.18

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3317,7 +3317,7 @@ exports[`samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json should cr
33173317
"FABLO_VERSION=2.2.0
33183318
FABLO_BUILD=<date with git hash>
33193319
FABLO_REST_VERSION=0.1.2
3320-
HYPERLEDGER_EXPLORER_VERSION=1.1.8
3320+
HYPERLEDGER_EXPLORER_VERSION=2.0.0
33213321
33223322
COUCHDB_VERSION=3.1
33233323
FABRIC_COUCHDB_VERSION=0.4.18
@@ -4823,14 +4823,14 @@ services:
48234823
- basic
48244824
48254825
db.explorer.example.com:
4826-
image: hyperledger/explorer-db:\${HYPERLEDGER_EXPLORER_VERSION}
4826+
image: ghcr.io/hyperledger-labs/explorer-db:\${HYPERLEDGER_EXPLORER_VERSION}
48274827
container_name: db.explorer.example.com
48284828
environment:
48294829
- DATABASE_DATABASE=fabricexplorer
48304830
- DATABASE_USERNAME=hppoc
48314831
- DATABASE_PASSWORD=password
48324832
healthcheck:
4833-
test: "pg_isready -h localhost -p 5432 -q -U postgres"
4833+
test: "pg_isready -h localhost -p 5432 -q -U hppoc -d fabricexplorer"
48344834
interval: 5s
48354835
timeout: 10s
48364836
retries: 7
@@ -4840,7 +4840,7 @@ services:
48404840
- basic
48414841
48424842
explorer.example.com:
4843-
image: hyperledger/explorer:\${HYPERLEDGER_EXPLORER_VERSION}
4843+
image: ghcr.io/hyperledger-labs/explorer:\${HYPERLEDGER_EXPLORER_VERSION}
48444844
restart: on-failure:8
48454845
container_name: explorer.example.com
48464846
environment:

‎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
@@ -1514,7 +1514,7 @@ exports[`samples/fablo-config-hlf3-1orgs-1chaincode.json should create proper e2
15141514
"FABLO_VERSION=2.2.0
15151515
FABLO_BUILD=<date with git hash>
15161516
FABLO_REST_VERSION=0.1.2
1517-
HYPERLEDGER_EXPLORER_VERSION=1.1.8
1517+
HYPERLEDGER_EXPLORER_VERSION=2.0.0
15181518
15191519
COUCHDB_VERSION=3.1
15201520
FABRIC_COUCHDB_VERSION=0.4.18

‎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
@@ -1539,7 +1539,7 @@ exports[`samples/fablo-config-hlf3-bft-1orgs-1chaincode.json should create prope
15391539
"FABLO_VERSION=2.2.0
15401540
FABLO_BUILD=<date with git hash>
15411541
FABLO_REST_VERSION=0.1.2
1542-
HYPERLEDGER_EXPLORER_VERSION=1.1.8
1542+
HYPERLEDGER_EXPLORER_VERSION=2.0.0
15431543
15441544
COUCHDB_VERSION=3.1
15451545
FABRIC_COUCHDB_VERSION=0.4.18

‎src/setup-docker/index.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ export default class SetupDockerGenerator extends Generator {
169169
fabloVersion: config.fabloVersion,
170170
fabloBuild: getBuildInfo(),
171171
fabloRestVersion: "0.1.2",
172-
hyperledgerExplorerVersion: "1.1.8",
172+
hyperledgerExplorerVersion: "2.0.0",
173173
fabricCouchDbVersion: "0.4.18",
174174
couchDbVersion: "3.1",
175175
fabricCaPostgresVersion: "14",

0 commit comments

Comments
 (0)