From 52ea46405cca31daa6904a53f637eb9e3eb11578 Mon Sep 17 00:00:00 2001
From: Marcin Rataj <lidel@lidel.org>
Date: Wed, 15 Dec 2021 22:48:13 +0100
Subject: [PATCH 1/2] chore: ipfs@0.61.0
https://github.com/ipfs/js-ipfs/blob/master/packages/ipfs/CHANGELOG.md#0610-2021-12-15
---
.circleci/main.yml | 16 ++--------------
1 file changed, 2 insertions(+), 14 deletions(-)
diff --git a/.circleci/main.yml b/.circleci/main.yml
index 7e197701ad2..061b61cc589 100644
--- a/.circleci/main.yml
+++ b/.circleci/main.yml
@@ -227,22 +227,13 @@ jobs:
name: Installing dependencies
command: |
npm init -y
- npm install ipfs@^0.59.1
- npm install ipfs/interop#master
+ npm install ipfs@^0.61.0
+ npm install ipfs/interop#feat/js-pubsub-and-dht
npm install mocha-circleci-reporter@0.0.3
working_directory: ~/ipfs/go-ipfs/interop
- run:
name: Running tests
command: |
- WORKDIR=$(pwd)
- cd /tmp
- git clone https://github.com/ipfs/js-ipfs.git
- cd js-ipfs
- git checkout 1dcac76f56972fc3519526e93567e39d685033dd
- npm install
- npm run build
- npm run link
- cd $WORKDIR
mkdir -p /tmp/test-results/interop/
export MOCHA_FILE="$(mktemp /tmp/test-results/interop/unit.XXXXXX.xml)"
npx ipfs-interop -- -t node -f $(sed -n -e "s|^require('\(.*\)')$|test/\1|p" node_modules/ipfs-interop/test/node.js | circleci tests split) -- --reporter mocha-circleci-reporter
@@ -251,9 +242,6 @@ jobs:
LIBP2P_TCP_REUSEPORT: false
LIBP2P_ALLOW_WEAK_RSA_KEYS: 1
IPFS_GO_EXEC: /tmp/circleci-workspace/bin/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
- store_test_results:
path: /tmp/test-results
go-ipfs-api:
From 89d1e0c012222fc34532572cb35d68fa8cc34058 Mon Sep 17 00:00:00 2001
From: Marcin Rataj <lidel@lidel.org>
Date: Thu, 16 Dec 2021 14:42:14 +0100
Subject: [PATCH 2/2] chore: ipfs-interop@8.0.0
---
.circleci/main.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.circleci/main.yml b/.circleci/main.yml
index 061b61cc589..19e6f0573e3 100644
--- a/.circleci/main.yml
+++ b/.circleci/main.yml
@@ -228,7 +228,7 @@ jobs:
command: |
npm init -y
npm install ipfs@^0.61.0
- npm install ipfs/interop#feat/js-pubsub-and-dht
+ npm install ipfs-interop@^8.0.0
npm install mocha-circleci-reporter@0.0.3
working_directory: ~/ipfs/go-ipfs/interop
- run: