From b27e470ef722e978667d37dcda6b3417f17a36b8 Mon Sep 17 00:00:00 2001 From: Marcin Rataj Date: Mon, 10 Jun 2024 00:06:38 +0200 Subject: [PATCH 1/2] chore: gateway-conformance v6 --- .github/workflows/gateway-conformance.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/gateway-conformance.yml b/.github/workflows/gateway-conformance.yml index 0f369864162..923e8f68cf3 100644 --- a/.github/workflows/gateway-conformance.yml +++ b/.github/workflows/gateway-conformance.yml @@ -41,7 +41,7 @@ jobs: steps: # 1. Download the gateway-conformance fixtures - name: Download gateway-conformance fixtures - uses: ipfs/gateway-conformance/.github/actions/extract-fixtures@v0.5 + uses: ipfs/gateway-conformance/.github/actions/extract-fixtures@7b222e6a73b82f05651aec3824ef139628198949 # TODO: switch to v0.6 with: output: fixtures @@ -84,9 +84,7 @@ jobs: # Import dnslink records # the IPFS_NS_MAP env will be used by the daemon - export IPFS_NS_MAP=$(cat "./fixtures/dnslinks.json" | jq -r '.subdomains | to_entries | map("\(.key).example.com:\(.value)") | join(",")') - export IPFS_NS_MAP="$(cat "./fixtures/dnslinks.json" | jq -r '.domains | to_entries | map("\(.key):\(.value)") | join(",")'),${IPFS_NS_MAP}" - echo "IPFS_NS_MAP=${IPFS_NS_MAP}" >> $GITHUB_ENV + echo "IPFS_NS_MAP=$(cat ./fixtures/dnslinks.IPFS_NS_MAP)" >> $GITHUB_ENV # 5. Start the kubo-gateway - name: Start kubo-gateway @@ -96,14 +94,15 @@ jobs: # 6. Run the gateway-conformance tests - name: Run gateway-conformance tests - uses: ipfs/gateway-conformance/.github/actions/test@v0.5 + uses: ipfs/gateway-conformance/.github/actions/test@7b222e6a73b82f05651aec3824ef139628198949 # TODO: switch to v0.6 with: gateway-url: http://127.0.0.1:8080 + subdomain-url: http://localhost:8080 + args: -skip 'TestGatewayCar/GET_response_for_application/vnd.ipld.car/Header_Content-Length' json: output.json xml: output.xml html: output.html markdown: output.md - args: -skip 'TestGatewayCar/GET_response_for_application/vnd.ipld.car/Header_Content-Length' # 7. Upload the results - name: Upload MD summary @@ -129,7 +128,7 @@ jobs: steps: # 1. Download the gateway-conformance fixtures - name: Download gateway-conformance fixtures - uses: ipfs/gateway-conformance/.github/actions/extract-fixtures@v0.5 + uses: ipfs/gateway-conformance/.github/actions/extract-fixtures@7b222e6a73b82f05651aec3824ef139628198949 # TODO: switch to v0.6 with: output: fixtures @@ -202,14 +201,14 @@ jobs: # 9. Run the gateway-conformance tests over libp2p - name: Run gateway-conformance tests over libp2p - uses: ipfs/gateway-conformance/.github/actions/test@v0.5 + uses: ipfs/gateway-conformance/.github/actions/test@7b222e6a73b82f05651aec3824ef139628198949 # TODO: switch to v0.6 with: gateway-url: http://127.0.0.1:8092 + args: --specs "trustless-gateway,-trustless-ipns-gateway" -skip 'TestGatewayCar/GET_response_for_application/vnd.ipld.car/Header_Content-Length' json: output.json xml: output.xml html: output.html markdown: output.md - args: --specs "trustless-gateway,-trustless-ipns-gateway" -skip 'TestGatewayCar/GET_response_for_application/vnd.ipld.car/Header_Content-Length' # 10. Upload the results - name: Upload MD summary From 2625a2e6d551d85694a4a652e505595884bab206 Mon Sep 17 00:00:00 2001 From: Marcin Rataj Date: Mon, 10 Jun 2024 23:34:31 +0200 Subject: [PATCH 2/2] chore: gateway-conformance v6 --- .github/workflows/gateway-conformance.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/gateway-conformance.yml b/.github/workflows/gateway-conformance.yml index 923e8f68cf3..b1791868c41 100644 --- a/.github/workflows/gateway-conformance.yml +++ b/.github/workflows/gateway-conformance.yml @@ -41,7 +41,7 @@ jobs: steps: # 1. Download the gateway-conformance fixtures - name: Download gateway-conformance fixtures - uses: ipfs/gateway-conformance/.github/actions/extract-fixtures@7b222e6a73b82f05651aec3824ef139628198949 # TODO: switch to v0.6 + uses: ipfs/gateway-conformance/.github/actions/extract-fixtures@v0.6 with: output: fixtures @@ -94,7 +94,7 @@ jobs: # 6. Run the gateway-conformance tests - name: Run gateway-conformance tests - uses: ipfs/gateway-conformance/.github/actions/test@7b222e6a73b82f05651aec3824ef139628198949 # TODO: switch to v0.6 + uses: ipfs/gateway-conformance/.github/actions/test@v0.6 with: gateway-url: http://127.0.0.1:8080 subdomain-url: http://localhost:8080 @@ -128,7 +128,7 @@ jobs: steps: # 1. Download the gateway-conformance fixtures - name: Download gateway-conformance fixtures - uses: ipfs/gateway-conformance/.github/actions/extract-fixtures@7b222e6a73b82f05651aec3824ef139628198949 # TODO: switch to v0.6 + uses: ipfs/gateway-conformance/.github/actions/extract-fixtures@v0.6 with: output: fixtures @@ -201,7 +201,7 @@ jobs: # 9. Run the gateway-conformance tests over libp2p - name: Run gateway-conformance tests over libp2p - uses: ipfs/gateway-conformance/.github/actions/test@7b222e6a73b82f05651aec3824ef139628198949 # TODO: switch to v0.6 + uses: ipfs/gateway-conformance/.github/actions/test@v0.6 with: gateway-url: http://127.0.0.1:8092 args: --specs "trustless-gateway,-trustless-ipns-gateway" -skip 'TestGatewayCar/GET_response_for_application/vnd.ipld.car/Header_Content-Length'