Skip to content

Commit 8e19bd1

Browse files
fix: gateway-conformance-libp2p-experiment
1 parent 4078374 commit 8e19bd1

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

.github/workflows/gateway-conformance.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ jobs:
172172
# 6. Setup a kubo http-p2p-proxy to expose libp2p protocol as a regular HTTP port for gateway conformance tests
173173
- name: Init p2p-proxy kubo node
174174
env:
175-
IPFS_PATH: "~/.kubo-p2p-proxy"
175+
IPFS_PATH: "${{ github.workspace }}/.kubo-p2p-proxy"
176176
run: |
177177
./ipfs init --profile=test -e
178178
./ipfs config --json Experimental.Libp2pStreamMounting true
@@ -183,18 +183,19 @@ jobs:
183183
# 7. Start the kubo http-p2p-proxy
184184
- name: Start kubo http-p2p-proxy
185185
env:
186-
IPFS_PATH: "~/.kubo-p2p-proxy"
186+
IPFS_PATH: "${{ github.workspace }}/.kubo-p2p-proxy"
187187
run: |
188-
( ./ipfs daemon & ) | sed '/Daemon is ready/q'
189-
while [[ "$(./ipfs id | jq '.Addresses | length')" == '0' ]]; do sleep 1; done
188+
./ipfs daemon &
189+
while ! ./ipfs --api=/ip4/127.0.0.1/tcp/5002 id > /dev/null 2>&1; do sleep 1; done
190190
working-directory: kubo-gateway/cmd/ipfs
191191

192192
# 8. Start forwarding data from the http-p2p-proxy to the node serving the Gateway API over libp2p
193193
- name: Start http-over-libp2p forwarding proxy
194194
run: |
195195
gatewayNodeId=$(./ipfs --api=/ip4/127.0.0.1/tcp/5001 id -f="<id>")
196196
./ipfs --api=/ip4/127.0.0.1/tcp/5002 swarm connect $(./ipfs --api=/ip4/127.0.0.1/tcp/5001 swarm addrs local --id | head -n 1)
197-
./ipfs --api=/ip4/127.0.0.1/tcp/5002 p2p forward --allow-custom-protocol /http/1.1 /ip4/127.0.0.1/tcp/8092 /p2p/$gatewayNodeId
197+
./ipfs --api=/ip4/127.0.0.1/tcp/5002 p2p forward --allow-custom-protocol /http/1.1 /ip4/127.0.0.1/tcp/8092 /p2p/$gatewayNodeId &
198+
sleep 2
198199
working-directory: kubo-gateway/cmd/ipfs
199200

200201
# 9. Run the gateway-conformance tests over libp2p

0 commit comments

Comments
 (0)