tmp

ipfs · Jun 8, 2023 · 6b0a69e · 6b0a69e
1 parent 419aa24
commit 6b0a69e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -35,8 +35,8 @@ jobs:
       - name: Configure Kubo Gateway
         run: |
           ipfs init;
-          source ./gateway-conformance/kubo-config.example.sh;
-          IPFS_NS_MAP=$(cat ./fixtures/dnslinks.json | jq -r 'to_entries | map("\(.key).example.com:\(.value)") | join(",")')
+          source ./gateway-conformance/kubo-config.example.sh "$(pwd)/fixtures"
+          echo "Extract ns map:" $IPFS_NS_MAP;
           echo "IPFS_NS_MAP=${IPFS_NS_MAP}" >> $GITHUB_ENV
         # note: the IPFS_NS_MAP set above will be passed the daemon
       - uses: ipfs/start-ipfs-daemon-action@v1

diff --git a/kubo-config.example.sh b/kubo-config.example.sh
@@ -1,4 +1,7 @@
 #! /usr/bin/env bash
+
+FIXTURES_PATH=${1:-$(pwd)}
+
 ipfs config --json Gateway.PublicGateways '{
 	"example.com": {
 		"UseSubdomains": true,
@@ -12,9 +15,8 @@ ipfs config --json Gateway.PublicGateways '{
 	}
 }'
 
-export IPFS_NS_MAP=$(cat ./dnslinks.json | jq -r '.subdomains | to_entries | map("\(.key).example.com:\(.value)") | join(",")')
-export IPFS_NS_MAP="$(cat ./dnslinks.json | jq -r '.domains | to_entries | map("\(.key):\(.value)") | join(",")'),${IPFS_NS_MAP}"
-
+export IPFS_NS_MAP=$(cat "${FIXTURES_PATH}/dnslinks.json" | jq -r '.subdomains | to_entries | map("\(.key).example.com:\(.value)") | join(",")')
+export IPFS_NS_MAP="$(cat "${FIXTURES_PATH}/dnslinks.json" | jq -r '.domains | to_entries | map("\(.key):\(.value)") | join(",")'),${IPFS_NS_MAP}"
 
 echo "Set the following IPFS_NS_MAP before starting the kubo daemon:"
 echo "IPFS_NS_MAP=${IPFS_NS_MAP}"