chore: switch to unreleased go/js-ipfs

the Rube Goldberg machine for testing HTTP RPC wire format changes end-to-end
ipfs · Nov 17, 2021 · f9407ce · f9407ce
1 parent 817204f
commit f9407ce
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 11 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -7,10 +7,10 @@ on:
 env:
  # To run CI against unrelased go-ipfs or js-ipfs-* code (eg. wip PR),
  # uncomment below and define git revisions in ./scripts/custom-runtime.sh
- #IPFS_GO_EXEC: /tmp/go-ipfs/cmd/ipfs/ipfs
- #IPFS_JS_EXEC: /tmp/js-ipfs/packages/ipfs/src/cli.js
- #IPFS_JS_MODULE: /tmp/js-ipfs/packages/ipfs/dist/cjs/src/index.js
- #IPFS_JS_HTTP_MODULE: /tmp/js-ipfs/packages/ipfs-http-client/dist/cjs/src/index.js
+ IPFS_GO_EXEC: /tmp/go-ipfs/cmd/ipfs/ipfs
+ IPFS_JS_EXEC: /tmp/js-ipfs/packages/ipfs/src/cli.js
+ IPFS_JS_MODULE: /tmp/js-ipfs/packages/ipfs/dist/cjs/src/index.js
+ IPFS_JS_HTTP_MODULE: /tmp/js-ipfs/packages/ipfs-http-client/dist/cjs/src/index.js
 
 jobs:
  build:

diff --git a/.gitignore b/.gitignore
@@ -37,4 +37,4 @@ dist
 test/test-data/go-ipfs-repo/LOCK
 test/test-data/go-ipfs-repo/LOG
 test/test-data/go-ipfs-repo/LOG.old
-types
+types
diff --git a/README.md b/README.md
@@ -24,6 +24,12 @@ $ npm install -g ipfs-interop
 $ ipfs-interop
 ```
 
+### Run a particular test locally
+
+```console
+$ node bin/ipfs-interop.js -- -t node --grep {substring-test-name}
+```
+
 ## Testing with different versions of go/js IPFS
 
 ### As a project

diff --git a/package-lock.json b/package-lock.json
diff --git a/scripts/custom-runtime.sh b/scripts/custom-runtime.sh
@@ -22,10 +22,10 @@ WORKDIR=$(pwd)
 if [ "$IPFS_GO_EXEC" == /tmp/go-ipfs/cmd/ipfs/ipfs ]; then
 if [ ! -d /tmp/go-ipfs ]; then
  cd /tmp
- git clone https://github.com/ipfs/go-ipfs.git
+ git clone https://github.com/coryschwartz/go-ipfs.git
  cd go-ipfs
- # set implementation to specific commit
- git checkout CHANGEME_GO
+ # implementation from https://github.com/ipfs/go-ipfs/pull/8183
+ git checkout 153697d524f449ee9bec97245b0fcd7ebc2e8170
  make build
 fi
 fi
@@ -35,8 +35,8 @@ if [ ! -d /tmp/js-ipfs ]; then
  cd /tmp
  git clone https://github.com/ipfs/js-ipfs.git
  cd js-ipfs
- # set implementation to specific commit
- git checkout CHANGEME_JS
+ # implementation from https://github.com/ipfs/js-ipfs/pull/3922
+ git checkout 1dcac76f56972fc3519526e93567e39d685033dd
  npm install
  npm run build
  npm run link