fix: go-libp2p-relay-daemon caching on ci

ipfs · Nov 29, 2021 · 3004b52 · 3004b52
1 parent e1f111a
commit 3004b52
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 5 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -31,6 +31,7 @@ jobs:
         with:
           path: |
             /tmp/*-ipfs/**
+            ./go-libp2p-relay-daemon
             ~/.npm
             ./node_modules
           key: ${{ runner.os }}-build-${{ env.CACHE_NAME }}-${{ github.event.pull_request.head.sha }}
@@ -56,6 +57,7 @@ jobs:
         with:
           path: |
             /tmp/*-ipfs/**
+            ./go-libp2p-relay-daemon
             ~/.npm
             ./node_modules
           key: ${{ runner.os }}-build-${{ env.CACHE_NAME }}-${{ github.event.pull_request.head.sha }}
@@ -84,6 +86,7 @@ jobs:
         with:
           path: |
             /tmp/*-ipfs/**
+            ./go-libp2p-relay-daemon
             ~/.npm
             ./node_modules
           key: ${{ runner.os }}-build-${{ env.CACHE_NAME }}-${{ github.event.pull_request.head.sha }}
@@ -119,6 +122,7 @@ jobs:
         with:
           path: |
             /tmp/*-ipfs/**
+            ./go-libp2p-relay-daemon
             ~/.npm
             ./node_modules
           key: ${{ runner.os }}-build-${{ env.CACHE_NAME }}-${{ github.event.pull_request.head.sha }}
@@ -151,6 +155,7 @@ jobs:
         with:
           path: |
             /tmp/*-ipfs/**
+            ./go-libp2p-relay-daemon
             ~/.npm
             ./node_modules
           key: ${{ runner.os }}-build-${{ env.CACHE_NAME }}-${{ github.event.pull_request.head.sha }}

diff --git a/scripts/custom-runtime.sh b/scripts/custom-runtime.sh
@@ -25,7 +25,7 @@ if [ ! -d /tmp/go-ipfs ]; then
         git clone https://github.com/ipfs/go-ipfs.git
         cd go-ipfs
             # set implementation to specific commit
-            git checkout f13fa35a68723b5702312bed4575911f7f0f2185
+            git checkout 8c902b156b1c35d17ce45de2525c80bf71c77b5b # https://github.com/ipfs/go-ipfs/pull/8563
             make build
 fi
 fi

diff --git a/scripts/setup-relayd.sh b/scripts/setup-relayd.sh
@@ -5,10 +5,13 @@
 
 set -eo pipefail
 
-if ! type relayd; then
+if ! test -e ./go-libp2p-relay-daemon/relayd; then
+    echo "Building ./go-libp2p-relay-daemon/relayd binary.."
+    rm -rf ./go-libp2p-relay-daemon
     git clone https://github.com/libp2p/go-libp2p-relay-daemon.git
     cd go-libp2p-relay-daemon
     # no releases atm, so we pin implementation to specific commit
     git checkout 65211a0b6d881086feb7c386d780f55c37dff101 # 2021-11-19
-    go install ./...
+    go build ./...
+    echo "./go-libp2p-relay-daemon/relayd is ready"
 fi
diff --git a/test/files.js b/test/files.js
@@ -20,7 +20,7 @@ const goOptions = {
     config: {
       // enabled sharding for go with automatic threshold dropped to the minimum
       Internal: {
-        UnixFSShardingSizeThreshold: "1B"
+        UnixFSShardingSizeThreshold: '1B'
       }
     }
   }

diff --git a/test/utils/relayd.js b/test/utils/relayd.js
@@ -12,7 +12,7 @@ export async function getRelayV (version, factory) {
   if (relays.has(version)) return relays.get(version)
   if (process.env.DEBUG) console.log(`Starting relayd_v${version}..`) // eslint-disable-line no-console
   if (version < 1 || version > 2) throw new Error('Unsupported circuit relay version')
-  const relayd = command(`relayd -config scripts/relayd_v${version}.config.json -id scripts/relayd_v${version}.identity`)
+  const relayd = command(`go-libp2p-relay-daemon/relayd -config scripts/relayd_v${version}.config.json -id scripts/relayd_v${version}.identity`)
   let id
   for await (const line of relayd.stdout) {
     const text = line.toString()