From f356f2840e00f167c932632b1273f4eddd15c9d2 Mon Sep 17 00:00:00 2001 From: Nishant Arora <1895906+whizzzkid@users.noreply.github.com> Date: Fri, 9 Jun 2023 00:30:12 -0600 Subject: [PATCH 1/5] fix: :wrench: Fixing Builds --- .github/workflows/build.yml | 6 +++--- .github/workflows/ci.yml | 12 ++++++------ .github/workflows/eslint.yml | 6 +++--- .github/workflows/test-e2e.yml | 4 ++-- .github/workflows/test-storybook.yml | 4 ++-- .github/workflows/test-unit.yml | 4 ++-- .github/workflows/typecheck.yml | 4 ++-- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 839762249..9ccb8d6ea 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,10 +11,10 @@ jobs: - name: Setup node uses: actions/setup-node@v2 with: - node-version: 16.12.0 - - name: Setup npm@8.1.0 + node-version: 18.14.0 + - name: Setup npm@9.6.0 run: | - npm install -g npm@8.1.0 + npm install -g npm@9.6.0 - name: Cache bigger downloads uses: actions/cache@v2 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3152cda73..2d9904463 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,10 +35,10 @@ jobs: - name: Setup node uses: actions/setup-node@v2 with: - node-version: 16.12.0 - - name: Setup npm@8.1.0 + node-version: 18.14.0 + - name: Setup npm@9.6.0 run: | - npm install -g npm@8.1.0 + npm install -g npm@9.6.0 - name: Download build artifact uses: actions/download-artifact@v2 @@ -207,10 +207,10 @@ jobs: - name: Setup node uses: actions/setup-node@v2 with: - node-version: 16.12.0 - - name: Setup npm@8.1.0 + node-version: 18.14.0 + - name: Setup npm@9.6.0 run: | - npm install -g npm@8.1.0 + npm install -g npm@9.6.0 - name: Install dependencies run: npm ci --prefer-offline --no-audit --progress=false --cache ${{ github.workspace }}/.cache/npm diff --git a/.github/workflows/eslint.yml b/.github/workflows/eslint.yml index 1963165b6..ca8c223b0 100644 --- a/.github/workflows/eslint.yml +++ b/.github/workflows/eslint.yml @@ -11,10 +11,10 @@ jobs: - name: Setup node uses: actions/setup-node@v1 with: - node-version: 16.12.0 - - name: Setup npm@8.1.0 + node-version: 18.14.0 + - name: Setup npm@9.6.0 run: | - npm install -g npm@8.1.0 + npm install -g npm@9.6.0 - name: Cache bigger downloads uses: actions/cache@v2 diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml index efe8e9639..89ff969b3 100644 --- a/.github/workflows/test-e2e.yml +++ b/.github/workflows/test-e2e.yml @@ -17,9 +17,9 @@ jobs: uses: actions/setup-node@v1 with: node-version: 16.12.0 - - name: Setup npm@8.1.0 + - name: Setup npm@9.6.0 run: | - npm install -g npm@8.1.0 + npm install -g npm@9.6.0 - name: Cache bigger downloads uses: actions/cache@v2 diff --git a/.github/workflows/test-storybook.yml b/.github/workflows/test-storybook.yml index 5ac5284de..70e6516f1 100644 --- a/.github/workflows/test-storybook.yml +++ b/.github/workflows/test-storybook.yml @@ -13,9 +13,9 @@ jobs: uses: actions/setup-node@v3 with: node-version: 16.12.0 - - name: Setup npm@8.1.0 + - name: Setup npm@9.6.0 run: | - npm install -g npm@8.1.0 + npm install -g npm@9.6.0 - name: Cache bigger downloads uses: actions/cache@v2 diff --git a/.github/workflows/test-unit.yml b/.github/workflows/test-unit.yml index 13fedadd8..226b11fa2 100644 --- a/.github/workflows/test-unit.yml +++ b/.github/workflows/test-unit.yml @@ -12,9 +12,9 @@ jobs: uses: actions/setup-node@v2 with: node-version: 16.12.0 - - name: Setup npm@8.1.0 + - name: Setup npm@9.6.0 run: | - npm install -g npm@8.1.0 + npm install -g npm@9.6.0 - name: Cache bigger downloads uses: actions/cache@v2 diff --git a/.github/workflows/typecheck.yml b/.github/workflows/typecheck.yml index f0af6b572..13a6aa442 100644 --- a/.github/workflows/typecheck.yml +++ b/.github/workflows/typecheck.yml @@ -13,9 +13,9 @@ jobs: uses: actions/setup-node@v1 with: node-version: 16.12.0 - - name: Setup npm@8.1.0 + - name: Setup npm@9.6.0 run: | - npm install -g npm@8.1.0 + npm install -g npm@9.6.0 - name: Cache bigger downloads uses: actions/cache@v2 From 21def993347ca50ceaeebd2e2d26b01e3bd37238 Mon Sep 17 00:00:00 2001 From: Nishant Arora <1895906+whizzzkid@users.noreply.github.com> Date: Fri, 9 Jun 2023 00:52:36 -0600 Subject: [PATCH 2/5] fix: :wrench: more version changes --- .github/workflows/build.yml | 2 +- .github/workflows/ci.yml | 4 ++-- .github/workflows/eslint.yml | 2 +- .github/workflows/node-test.yml | 2 +- .github/workflows/test-e2e.yml | 4 ++-- .github/workflows/test-storybook.yml | 4 ++-- .github/workflows/test-unit.yml | 4 ++-- .github/workflows/typecheck.yml | 4 ++-- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9ccb8d6ea..c632e5d5b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,7 +9,7 @@ jobs: - uses: actions/checkout@v2 - name: Setup node - uses: actions/setup-node@v2 + uses: actions/setup-node@v3.6.0 with: node-version: 18.14.0 - name: Setup npm@9.6.0 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2d9904463..acbdc961e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,7 +33,7 @@ jobs: - uses: actions/checkout@v2 - name: Setup node - uses: actions/setup-node@v2 + uses: actions/setup-node@v3.6.0 with: node-version: 18.14.0 - name: Setup npm@9.6.0 @@ -205,7 +205,7 @@ jobs: echo ${{ needs.publishPreview.outputs.cid }} > .cid - name: Setup node - uses: actions/setup-node@v2 + uses: actions/setup-node@v3.6.0 with: node-version: 18.14.0 - name: Setup npm@9.6.0 diff --git a/.github/workflows/eslint.yml b/.github/workflows/eslint.yml index ca8c223b0..ee639bc33 100644 --- a/.github/workflows/eslint.yml +++ b/.github/workflows/eslint.yml @@ -9,7 +9,7 @@ jobs: - uses: actions/checkout@v1 - name: Setup node - uses: actions/setup-node@v1 + uses: actions/setup-node@v3.6.0 with: node-version: 18.14.0 - name: Setup npm@9.6.0 diff --git a/.github/workflows/node-test.yml b/.github/workflows/node-test.yml index 80c798a11..81e2d4321 100644 --- a/.github/workflows/node-test.yml +++ b/.github/workflows/node-test.yml @@ -40,7 +40,7 @@ jobs: - uses: actions/checkout@v2 - name: Use Node.js ${{ inputs.gh-node-version }} - uses: actions/setup-node@v1 + uses: actions/setup-node@v3.6.0 with: node-version: ${{ inputs.gh-node-version }} diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml index 89ff969b3..9fd51be4b 100644 --- a/.github/workflows/test-e2e.yml +++ b/.github/workflows/test-e2e.yml @@ -14,9 +14,9 @@ jobs: - uses: actions/checkout@v2 - name: Setup node - uses: actions/setup-node@v1 + uses: actions/setup-node@v3.6.0 with: - node-version: 16.12.0 + node-version: 18.14.0 - name: Setup npm@9.6.0 run: | npm install -g npm@9.6.0 diff --git a/.github/workflows/test-storybook.yml b/.github/workflows/test-storybook.yml index 70e6516f1..45a758536 100644 --- a/.github/workflows/test-storybook.yml +++ b/.github/workflows/test-storybook.yml @@ -10,9 +10,9 @@ jobs: - uses: actions/checkout@v3 - name: Setup node - uses: actions/setup-node@v3 + uses: actions/setup-node@v3.6.0 with: - node-version: 16.12.0 + node-version: 18.14.0 - name: Setup npm@9.6.0 run: | npm install -g npm@9.6.0 diff --git a/.github/workflows/test-unit.yml b/.github/workflows/test-unit.yml index 226b11fa2..9b9044c0e 100644 --- a/.github/workflows/test-unit.yml +++ b/.github/workflows/test-unit.yml @@ -9,9 +9,9 @@ jobs: - uses: actions/checkout@v2 - name: Setup node - uses: actions/setup-node@v2 + uses: actions/setup-node@v3.6.0 with: - node-version: 16.12.0 + node-version: 18.14.0 - name: Setup npm@9.6.0 run: | npm install -g npm@9.6.0 diff --git a/.github/workflows/typecheck.yml b/.github/workflows/typecheck.yml index 13a6aa442..2176b62a5 100644 --- a/.github/workflows/typecheck.yml +++ b/.github/workflows/typecheck.yml @@ -10,9 +10,9 @@ jobs: - uses: actions/checkout@v1 - name: Setup node - uses: actions/setup-node@v1 + uses: actions/setup-node@v3.6.0 with: - node-version: 16.12.0 + node-version: 18.14.0 - name: Setup npm@9.6.0 run: | npm install -g npm@9.6.0 From 74223041e5353a1ee297e51a0288fd9e6bdf4f29 Mon Sep 17 00:00:00 2001 From: Nishant Arora <1895906+whizzzkid@users.noreply.github.com> Date: Fri, 9 Jun 2023 00:59:15 -0600 Subject: [PATCH 3/5] fix: :wastebasket: removing ipld patch --- patches/ipld+0.29.0.patch | 48 --------------------------------------- 1 file changed, 48 deletions(-) delete mode 100644 patches/ipld+0.29.0.patch diff --git a/patches/ipld+0.29.0.patch b/patches/ipld+0.29.0.patch deleted file mode 100644 index 66bd4d24c..000000000 --- a/patches/ipld+0.29.0.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/node_modules/ipld/src/index.js b/node_modules/ipld/src/index.js -index 12b046f..1ae185b 100644 ---- a/node_modules/ipld/src/index.js -+++ b/node_modules/ipld/src/index.js -@@ -2,6 +2,7 @@ - - const Block = require('ipld-block') - const CID = require('cids') -+const {CID: newCID} = require('multiformats/cid') - const mergeOptions = require('merge-options') - const ipldDagCbor = require('ipld-dag-cbor') - const ipldDagPb = require('ipld-dag-pb') -@@ -96,7 +97,7 @@ class IPLDResolver { - * @param {ResolveOptions} [options] - */ - resolve (cid, path, options) { -- if (!CID.isCID(cid)) { -+ if (!CID.isCID(cid) && newCID.asCID(cid) == null) { - throw new Error('`cid` argument must be a CID') - } - if (typeof path !== 'string') { -@@ -108,7 +109,7 @@ class IPLDResolver { - const generator = async function * () { - // End iteration if there isn't a CID to follow any more - while (true) { -- const format = await ipld.getFormat(multicodec.getCodeFromName(cid.codec)) -+ const format = await ipld.getFormat(cid.code ?? multicodec.getCodeFromName(cid.codec)) - - // get block - // use local resolver -@@ -153,7 +154,7 @@ class IPLDResolver { - */ - async get (cid, options) { - const block = await this.bs.get(cid, options) -- const format = await this.getFormat(block.cid.codec) -+ const format = await this.getFormat(block.cid.code ?? block.cid.codec) - const node = format.util.deserialize(block.data) - - return node -@@ -332,7 +333,7 @@ class IPLDResolver { - */ - const maybeRecurse = async (block, treePath) => { - // A treepath we might want to follow recursively -- const format = await this.getFormat(multicodec.getCodeFromName(block.cid.codec)) -+ const format = await this.getFormat(multicodec.getCodeFromName(block.cid.code ?? block.cid.codec)) - const result = format.resolver.resolve(block.data, treePath) - // Something to follow recursively, hence push it into the queue - if (CID.isCID(result.value)) { From a70a5daf9db05f461b80df9aaba9d99b221b20c6 Mon Sep 17 00:00:00 2001 From: Nishant Arora <1895906+whizzzkid@users.noreply.github.com> Date: Fri, 9 Jun 2023 01:09:07 -0600 Subject: [PATCH 4/5] fix: :wrench: fixing checkout action --- .github/workflows/build.yml | 2 +- .github/workflows/ci.yml | 4 ++-- .github/workflows/eslint.yml | 2 +- .github/workflows/node-test.yml | 2 +- .github/workflows/test-e2e.yml | 2 +- .github/workflows/test-storybook.yml | 2 +- .github/workflows/test-unit.yml | 2 +- .github/workflows/tx-pull.yml | 2 +- .github/workflows/typecheck.yml | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c632e5d5b..f4c0fb2e5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,7 +6,7 @@ jobs: name: build runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3.5.2 - name: Setup node uses: actions/setup-node@v3.6.0 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index acbdc961e..9ddf6402a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,7 +30,7 @@ jobs: outputs: cid: ${{ steps.ipfs.outputs.cid }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3.5.2 - name: Setup node uses: actions/setup-node@v3.6.0 @@ -176,7 +176,7 @@ jobs: needs: [build, publishPreview, eslint, typecheck, test-e2e, test-unit, test-storybook] steps: - name: Checkout 🛎️ - uses: actions/checkout@v2 + uses: actions/checkout@v3.5.2 with: persist-credentials: false diff --git a/.github/workflows/eslint.yml b/.github/workflows/eslint.yml index ee639bc33..6ce07e327 100644 --- a/.github/workflows/eslint.yml +++ b/.github/workflows/eslint.yml @@ -6,7 +6,7 @@ jobs: name: eslint runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v3.5.2 - name: Setup node uses: actions/setup-node@v3.6.0 diff --git a/.github/workflows/node-test.yml b/.github/workflows/node-test.yml index 81e2d4321..a56f0b797 100644 --- a/.github/workflows/node-test.yml +++ b/.github/workflows/node-test.yml @@ -37,7 +37,7 @@ jobs: node-version: ${{ steps.node_version.outputs.version }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3.5.2 - name: Use Node.js ${{ inputs.gh-node-version }} uses: actions/setup-node@v3.6.0 diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml index 9fd51be4b..5b24438c7 100644 --- a/.github/workflows/test-e2e.yml +++ b/.github/workflows/test-e2e.yml @@ -11,7 +11,7 @@ jobs: matrix: backend: [go] # TODO: add 'js' – see https://github.com/ipfs/ipfs-webui/issues/1737 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3.5.2 - name: Setup node uses: actions/setup-node@v3.6.0 diff --git a/.github/workflows/test-storybook.yml b/.github/workflows/test-storybook.yml index 45a758536..b8e791612 100644 --- a/.github/workflows/test-storybook.yml +++ b/.github/workflows/test-storybook.yml @@ -7,7 +7,7 @@ jobs: name: 'test:storybook' runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v3.5.2 - name: Setup node uses: actions/setup-node@v3.6.0 diff --git a/.github/workflows/test-unit.yml b/.github/workflows/test-unit.yml index 9b9044c0e..971f6b5cd 100644 --- a/.github/workflows/test-unit.yml +++ b/.github/workflows/test-unit.yml @@ -6,7 +6,7 @@ jobs: name: 'test:unit' runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3.5.2 - name: Setup node uses: actions/setup-node@v3.6.0 diff --git a/.github/workflows/tx-pull.yml b/.github/workflows/tx-pull.yml index d649e43f0..6e92acb46 100644 --- a/.github/workflows/tx-pull.yml +++ b/.github/workflows/tx-pull.yml @@ -8,7 +8,7 @@ jobs: tx-sync: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3.5.2 - name: Install Transifex client run: | curl -o- https://raw.githubusercontent.com/transifex/cli/master/install.sh | bash diff --git a/.github/workflows/typecheck.yml b/.github/workflows/typecheck.yml index 2176b62a5..077ab7cf9 100644 --- a/.github/workflows/typecheck.yml +++ b/.github/workflows/typecheck.yml @@ -7,7 +7,7 @@ jobs: name: typecheck runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v3.5.2 - name: Setup node uses: actions/setup-node@v3.6.0 From ab1720c58a19d895919d12e91a26427c5ab8494d Mon Sep 17 00:00:00 2001 From: Nishant Arora <1895906+whizzzkid@users.noreply.github.com> Date: Fri, 9 Jun 2023 01:13:30 -0600 Subject: [PATCH 5/5] fix: :wrench: fixing cache action --- .github/workflows/build.yml | 4 ++-- .github/workflows/ci.yml | 6 +++--- .github/workflows/eslint.yml | 2 +- .github/workflows/node-test.yml | 2 +- .github/workflows/test-e2e.yml | 2 +- .github/workflows/test-storybook.yml | 2 +- .github/workflows/test-unit.yml | 2 +- .github/workflows/typecheck.yml | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f4c0fb2e5..f2d447bb2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,7 +17,7 @@ jobs: npm install -g npm@9.6.0 - name: Cache bigger downloads - uses: actions/cache@v2 + uses: actions/cache@v3.3.1 id: cache with: path: ${{ github.workspace }}/.cache @@ -32,7 +32,7 @@ jobs: # Separate cache for build dir, we reuse it in release publish workflow - name: Cache build output if: startsWith(github.ref, 'refs/tags/v') - uses: actions/cache@v2 + uses: actions/cache@v3.3.1 id: build-cache with: path: build diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9ddf6402a..8c457cb1e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,7 +47,7 @@ jobs: path: build - name: Cache bigger downloads - uses: actions/cache@v2 + uses: actions/cache@v3.3.1 id: cache with: path: ${{ github.workspace }}/.cache @@ -181,7 +181,7 @@ jobs: persist-credentials: false - name: Cache bigger downloads - uses: actions/cache@v2 + uses: actions/cache@v3.3.1 id: cache with: path: ${{ github.workspace }}/.cache @@ -191,7 +191,7 @@ jobs: ${{ runner.os }}- - name: Cache build dir - uses: actions/cache@v2 + uses: actions/cache@v3.3.1 id: build-cache with: path: build diff --git a/.github/workflows/eslint.yml b/.github/workflows/eslint.yml index 6ce07e327..eaaaec480 100644 --- a/.github/workflows/eslint.yml +++ b/.github/workflows/eslint.yml @@ -17,7 +17,7 @@ jobs: npm install -g npm@9.6.0 - name: Cache bigger downloads - uses: actions/cache@v2 + uses: actions/cache@v3.3.1 id: cache with: path: ${{ github.workspace }}/.cache diff --git a/.github/workflows/node-test.yml b/.github/workflows/node-test.yml index a56f0b797..d2a0fa4d6 100644 --- a/.github/workflows/node-test.yml +++ b/.github/workflows/node-test.yml @@ -54,7 +54,7 @@ jobs: echo "version=$(node --version)" >> $GITHUB_OUTPUT - name: Cache bigger downloads - uses: actions/cache@v2 + uses: actions/cache@v3.3.1 id: cache with: path: ${{ github.workspace }}/.cache diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml index 5b24438c7..b5fa62c01 100644 --- a/.github/workflows/test-e2e.yml +++ b/.github/workflows/test-e2e.yml @@ -22,7 +22,7 @@ jobs: npm install -g npm@9.6.0 - name: Cache bigger downloads - uses: actions/cache@v2 + uses: actions/cache@v3.3.1 id: cache with: path: ${{ github.workspace }}/.cache diff --git a/.github/workflows/test-storybook.yml b/.github/workflows/test-storybook.yml index b8e791612..ff8538152 100644 --- a/.github/workflows/test-storybook.yml +++ b/.github/workflows/test-storybook.yml @@ -18,7 +18,7 @@ jobs: npm install -g npm@9.6.0 - name: Cache bigger downloads - uses: actions/cache@v2 + uses: actions/cache@v3.3.1 id: cache with: path: ${{ github.workspace }}/.cache diff --git a/.github/workflows/test-unit.yml b/.github/workflows/test-unit.yml index 971f6b5cd..4a8f8950e 100644 --- a/.github/workflows/test-unit.yml +++ b/.github/workflows/test-unit.yml @@ -17,7 +17,7 @@ jobs: npm install -g npm@9.6.0 - name: Cache bigger downloads - uses: actions/cache@v2 + uses: actions/cache@v3.3.1 id: cache with: path: ${{ github.workspace }}/.cache diff --git a/.github/workflows/typecheck.yml b/.github/workflows/typecheck.yml index 077ab7cf9..2d3fad749 100644 --- a/.github/workflows/typecheck.yml +++ b/.github/workflows/typecheck.yml @@ -18,7 +18,7 @@ jobs: npm install -g npm@9.6.0 - name: Cache bigger downloads - uses: actions/cache@v2 + uses: actions/cache@v3.3.1 id: cache with: path: ${{ github.workspace }}/.cache