File tree Expand file tree Collapse file tree 3 files changed +10
-31
lines changed
Expand file tree Collapse file tree 3 files changed +10
-31
lines changed Original file line number Diff line number Diff line change @@ -172,35 +172,11 @@ jobs:
172172
173173 test-05-v3 :
174174 needs : test-main
175- runs-on : macos-13
175+ runs-on : ubuntu-latest
176176 steps :
177177 - name : Check out repository code
178178 uses : actions/checkout@v2
179-
180- - name : Fix Python conflicts between macOS runner and Homebrew
181- run : |
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
197-
198- - name : Install dependencies
199- run : |
200- brew install shellcheck yamllint
201- npm install -g npm@latest
202- npm install
203-
179+
204180 - name : Build Fablo
205181 run : |
206182 shellcheck --version && \
@@ -219,7 +195,7 @@ jobs:
219195 e2e-network/docker/test-05-v3.sh.logs/*
220196 e2e-network/docker/test-05-v3.sh.tmpdir/fablo-target/**/*
221197
222- test-05 -v3-BFT :
198+ test-06 -v3-BFT :
223199 needs : test-main
224200 runs-on : ubuntu-latest
225201 steps :
Original file line number Diff line number Diff line change @@ -109,11 +109,11 @@ expectInvoke "peer1.org1.example.com" "my-channel1" "chaincode1" \
109109expectCommand " cat \" $TEST_TMP /newest.block\" " " KVContract:get"
110110
111111(cd " $TEST_TMP " && " $FABLO_HOME /fablo.sh" channel fetch 3 my-channel1 org1 peer1 " another.block" )
112- expectCommand " cat \" $TEST_TMP /another.block\" " " KVContract: put"
112+ expectCommand " cat \" $TEST_TMP /another.block\" " " put"
113113
114114(cd " $TEST_TMP " && " $FABLO_HOME /fablo.sh" channel fetch config my-channel1 org1 peer1 " channel-config.json" )
115115expectCommand " cat \" $TEST_TMP /channel-config.json\" " " \" mod_policy\" : \" Admins\" ,"
116116
117- expectCommand " (cd \" $TEST_TMP \" && \" $FABLO_HOME /fablo.sh\" channel getinfo my-channel1 org1 peer1)" " \" height\" :5 "
117+ expectCommand " (cd \" $TEST_TMP \" && \" $FABLO_HOME /fablo.sh\" channel getinfo my-channel1 org1 peer1)" " \" height\" :6 "
118118
119119echo " 🎉 Test passed! 🎉"
You can’t perform that action at this time.
0 commit comments