chore: gateway-conformance v6

ipfs · Jun 17, 2024 · b27e470 · b27e470
1 parent 121c602
commit b27e470
Showing 1 changed file with 8 additions and 9 deletions.
diff --git 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