From cb981d0d57c2d19c66f869e148c9d364eec9607d Mon Sep 17 00:00:00 2001 From: Jack Works Date: Thu, 24 Feb 2022 18:34:16 +0800 Subject: [PATCH 1/7] feat: use corepack --- .circleci/config.yml | 10 +++++----- .github/workflows/compile.yml | 2 -- .github/workflows/deploy-proxy.yml | 2 -- .github/workflows/linters.yml | 6 ++---- .github/workflows/netlify.yml | 2 -- cspell.json | 4 ++++ docs/caveats.md | 4 ++-- package.json | 4 ++-- 8 files changed, 15 insertions(+), 19 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0843af0d8826..0cc9c83f7a68 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,7 +6,7 @@ version: 2.1 executors: mask_node: docker: - - image: circleci/node:15.3.0 + - image: cimg/node:17.5 working_directory: ~/repo commands: restore_workspace: @@ -24,8 +24,8 @@ jobs: keys: - v3-mask-cache-pnpm - run: - name: Install PNPM - command: sudo npm install -g pnpm@6.4.0 + name: Enable corepack + command: sudo corepack enable - run: name: Install Dependencies command: pnpm install --frozen-lockfile --store-dir ~/.pnpm/ @@ -43,8 +43,8 @@ jobs: steps: - restore_workspace - run: - name: Install PNPM - command: sudo npm install -g pnpm@6.4.0 + name: Enable corepack + command: sudo corepack enable - run: name: Build Mask Network command: npx gulp build-ci diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml index b6b4f682a84f..ec4107b545e5 100644 --- a/.github/workflows/compile.yml +++ b/.github/workflows/compile.yml @@ -29,8 +29,6 @@ jobs: ref: ${{ github.event.pull_request.head.sha }} fetch-depth: 0 - uses: pnpm/action-setup@v2 - with: - version: '6.23.1' - uses: actions/setup-node@v2 with: node-version: '16' diff --git a/.github/workflows/deploy-proxy.yml b/.github/workflows/deploy-proxy.yml index 2ed47950b5f9..fee14bf6403e 100644 --- a/.github/workflows/deploy-proxy.yml +++ b/.github/workflows/deploy-proxy.yml @@ -18,8 +18,6 @@ jobs: ref: ${{ github.event.pull_request.head.sha }} fetch-depth: 0 - uses: pnpm/action-setup@v2 - with: - version: latest - uses: actions/setup-node@v2 with: cache: pnpm diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml index fe364e86fbad..e35e92aa0770 100644 --- a/.github/workflows/linters.yml +++ b/.github/workflows/linters.yml @@ -53,8 +53,6 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} - uses: pnpm/action-setup@v2 - with: - version: "6.23.1" - uses: actions/setup-node@v2 with: node-version: "16" @@ -73,7 +71,7 @@ jobs: ref: ${{ github.event.pull_request.head.sha }} - uses: pnpm/action-setup@v2 with: - version: "6.23.1" + version: "6.32.0" - uses: actions/setup-node@v2 with: node-version: "16" @@ -90,7 +88,7 @@ jobs: ref: ${{ github.event.pull_request.head.sha }} - uses: pnpm/action-setup@v2 with: - version: "6.23.1" + version: "6.32.0" - uses: actions/setup-node@v2 with: node-version: "16" diff --git a/.github/workflows/netlify.yml b/.github/workflows/netlify.yml index 0b00d7b3be51..00b52d2258e0 100644 --- a/.github/workflows/netlify.yml +++ b/.github/workflows/netlify.yml @@ -28,8 +28,6 @@ jobs: ref: ${{ github.event.pull_request.head.sha }} fetch-depth: 0 - uses: pnpm/action-setup@v2 - with: - version: '6.23.1' - uses: actions/setup-node@v2 with: node-version: '16' diff --git a/cspell.json b/cspell.json index f1b3c94c1aef..ea9a9ce8f6e7 100644 --- a/cspell.json +++ b/cspell.json @@ -399,6 +399,10 @@ { "filename": "**/qya-AA.json", "enabled": false + }, + { + "filename": ".circleci/config.yml", + "ignoreWords": ["cimg"] } ] } diff --git a/docs/caveats.md b/docs/caveats.md index e09511ac416c..476773684f88 100644 --- a/docs/caveats.md +++ b/docs/caveats.md @@ -19,8 +19,8 @@ This section is going to help you to set up the development environment of Mask To develop Mask Network, you need to have ... -- Node 15 or higher -- [pnpm](https://pnpm.js.org) 5+ +- Node 16 or higher +- [pnpm](https://pnpm.js.org) 6.32.1 ## Development diff --git a/package.json b/package.json index c13aba45e43c..874c4041d5f9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mask-network", - "packageManager": "pnpm@6.30.1", + "packageManager": "pnpm@6.32.1", "version": "2.5.0", "private": true, "license": "AGPL-3.0-or-later", @@ -79,7 +79,7 @@ }, "engines": { "node": ">=16.0.0", - "pnpm": ">=6" + "pnpm": ">=6.32.1" }, "pnpm": { "overrides": { From 59622b01671c601a76506ae0b569ee123e5db282 Mon Sep 17 00:00:00 2001 From: Jack Works Date: Thu, 24 Feb 2022 18:52:00 +0800 Subject: [PATCH 2/7] fix: use pr version --- .github/workflows/compile.yml | 2 +- .github/workflows/deploy-proxy.yml | 2 +- .github/workflows/linters.yml | 6 +++--- .github/workflows/netlify.yml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml index ec4107b545e5..337dd8161a38 100644 --- a/.github/workflows/compile.yml +++ b/.github/workflows/compile.yml @@ -28,7 +28,7 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} fetch-depth: 0 - - uses: pnpm/action-setup@v2 + - uses: pnpm/action-setup@fix - uses: actions/setup-node@v2 with: node-version: '16' diff --git a/.github/workflows/deploy-proxy.yml b/.github/workflows/deploy-proxy.yml index fee14bf6403e..e76803992e81 100644 --- a/.github/workflows/deploy-proxy.yml +++ b/.github/workflows/deploy-proxy.yml @@ -17,7 +17,7 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} fetch-depth: 0 - - uses: pnpm/action-setup@v2 + - uses: pnpm/action-setup@fix - uses: actions/setup-node@v2 with: cache: pnpm diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml index e35e92aa0770..5447a0a27e83 100644 --- a/.github/workflows/linters.yml +++ b/.github/workflows/linters.yml @@ -52,7 +52,7 @@ jobs: - uses: actions/checkout@v2 with: ref: ${{ github.event.pull_request.head.sha }} - - uses: pnpm/action-setup@v2 + - uses: pnpm/action-setup@fix - uses: actions/setup-node@v2 with: node-version: "16" @@ -69,7 +69,7 @@ jobs: - uses: actions/checkout@v2 with: ref: ${{ github.event.pull_request.head.sha }} - - uses: pnpm/action-setup@v2 + - uses: pnpm/action-setup@fix with: version: "6.32.0" - uses: actions/setup-node@v2 @@ -86,7 +86,7 @@ jobs: - uses: actions/checkout@v2 with: ref: ${{ github.event.pull_request.head.sha }} - - uses: pnpm/action-setup@v2 + - uses: pnpm/action-setup@fix with: version: "6.32.0" - uses: actions/setup-node@v2 diff --git a/.github/workflows/netlify.yml b/.github/workflows/netlify.yml index 00b52d2258e0..a22423e328b4 100644 --- a/.github/workflows/netlify.yml +++ b/.github/workflows/netlify.yml @@ -27,7 +27,7 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} fetch-depth: 0 - - uses: pnpm/action-setup@v2 + - uses: pnpm/action-setup@fix - uses: actions/setup-node@v2 with: node-version: '16' From 23284cc18d6bf26b34eaf5779ab127adaf3cb008 Mon Sep 17 00:00:00 2001 From: Jack Works Date: Thu, 24 Feb 2022 18:54:36 +0800 Subject: [PATCH 3/7] fix: ci --- cspell.json | 1 + 1 file changed, 1 insertion(+) diff --git a/cspell.json b/cspell.json index ea9a9ce8f6e7..d49cdd918982 100644 --- a/cspell.json +++ b/cspell.json @@ -59,6 +59,7 @@ "contrib", "contribs", "cooldown", + "corepack", "counterparty", "cyberconnect", "cyberlab", From 5b8690bf78b028926fd4b9747503df1c5c0565a0 Mon Sep 17 00:00:00 2001 From: Jack Works Date: Thu, 24 Feb 2022 18:59:32 +0800 Subject: [PATCH 4/7] feat: use corepack --- .github/workflows/linters.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml index 5447a0a27e83..187270c885fc 100644 --- a/.github/workflows/linters.yml +++ b/.github/workflows/linters.yml @@ -70,8 +70,6 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} - uses: pnpm/action-setup@fix - with: - version: "6.32.0" - uses: actions/setup-node@v2 with: node-version: "16" @@ -87,8 +85,6 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} - uses: pnpm/action-setup@fix - with: - version: "6.32.0" - uses: actions/setup-node@v2 with: node-version: "16" From 6845e2408e30798e41194023c9e7b1e72d46626c Mon Sep 17 00:00:00 2001 From: Jack Works Date: Fri, 25 Feb 2022 12:45:31 +0800 Subject: [PATCH 5/7] chore: use formal version --- .github/workflows/compile.yml | 2 +- .github/workflows/deploy-proxy.yml | 2 +- .github/workflows/linters.yml | 6 +++--- .github/workflows/netlify.yml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml index 337dd8161a38..cb9b35db6acb 100644 --- a/.github/workflows/compile.yml +++ b/.github/workflows/compile.yml @@ -28,7 +28,7 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} fetch-depth: 0 - - uses: pnpm/action-setup@fix + - uses: pnpm/action-setup@2 - uses: actions/setup-node@v2 with: node-version: '16' diff --git a/.github/workflows/deploy-proxy.yml b/.github/workflows/deploy-proxy.yml index e76803992e81..cb8af07acf70 100644 --- a/.github/workflows/deploy-proxy.yml +++ b/.github/workflows/deploy-proxy.yml @@ -17,7 +17,7 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} fetch-depth: 0 - - uses: pnpm/action-setup@fix + - uses: pnpm/action-setup@2 - uses: actions/setup-node@v2 with: cache: pnpm diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml index 187270c885fc..c4166be3f859 100644 --- a/.github/workflows/linters.yml +++ b/.github/workflows/linters.yml @@ -52,7 +52,7 @@ jobs: - uses: actions/checkout@v2 with: ref: ${{ github.event.pull_request.head.sha }} - - uses: pnpm/action-setup@fix + - uses: pnpm/action-setup@2 - uses: actions/setup-node@v2 with: node-version: "16" @@ -69,7 +69,7 @@ jobs: - uses: actions/checkout@v2 with: ref: ${{ github.event.pull_request.head.sha }} - - uses: pnpm/action-setup@fix + - uses: pnpm/action-setup@2 - uses: actions/setup-node@v2 with: node-version: "16" @@ -84,7 +84,7 @@ jobs: - uses: actions/checkout@v2 with: ref: ${{ github.event.pull_request.head.sha }} - - uses: pnpm/action-setup@fix + - uses: pnpm/action-setup@2 - uses: actions/setup-node@v2 with: node-version: "16" diff --git a/.github/workflows/netlify.yml b/.github/workflows/netlify.yml index a22423e328b4..98efbfc3e351 100644 --- a/.github/workflows/netlify.yml +++ b/.github/workflows/netlify.yml @@ -27,7 +27,7 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} fetch-depth: 0 - - uses: pnpm/action-setup@fix + - uses: pnpm/action-setup@2 - uses: actions/setup-node@v2 with: node-version: '16' From d22c1d5bfcaec66887f19dc796c5a413d24a0d27 Mon Sep 17 00:00:00 2001 From: Jack Works Date: Fri, 25 Feb 2022 12:58:52 +0800 Subject: [PATCH 6/7] fix: version --- .github/workflows/compile.yml | 2 +- .github/workflows/deploy-proxy.yml | 2 +- .github/workflows/linters.yml | 6 +++--- .github/workflows/netlify.yml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml index cb9b35db6acb..ec4107b545e5 100644 --- a/.github/workflows/compile.yml +++ b/.github/workflows/compile.yml @@ -28,7 +28,7 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} fetch-depth: 0 - - uses: pnpm/action-setup@2 + - uses: pnpm/action-setup@v2 - uses: actions/setup-node@v2 with: node-version: '16' diff --git a/.github/workflows/deploy-proxy.yml b/.github/workflows/deploy-proxy.yml index cb8af07acf70..fee14bf6403e 100644 --- a/.github/workflows/deploy-proxy.yml +++ b/.github/workflows/deploy-proxy.yml @@ -17,7 +17,7 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} fetch-depth: 0 - - uses: pnpm/action-setup@2 + - uses: pnpm/action-setup@v2 - uses: actions/setup-node@v2 with: cache: pnpm diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml index c4166be3f859..4740d3013d79 100644 --- a/.github/workflows/linters.yml +++ b/.github/workflows/linters.yml @@ -52,7 +52,7 @@ jobs: - uses: actions/checkout@v2 with: ref: ${{ github.event.pull_request.head.sha }} - - uses: pnpm/action-setup@2 + - uses: pnpm/action-setup@v2 - uses: actions/setup-node@v2 with: node-version: "16" @@ -69,7 +69,7 @@ jobs: - uses: actions/checkout@v2 with: ref: ${{ github.event.pull_request.head.sha }} - - uses: pnpm/action-setup@2 + - uses: pnpm/action-setup@v2 - uses: actions/setup-node@v2 with: node-version: "16" @@ -84,7 +84,7 @@ jobs: - uses: actions/checkout@v2 with: ref: ${{ github.event.pull_request.head.sha }} - - uses: pnpm/action-setup@2 + - uses: pnpm/action-setup@v2 - uses: actions/setup-node@v2 with: node-version: "16" diff --git a/.github/workflows/netlify.yml b/.github/workflows/netlify.yml index 98efbfc3e351..00b52d2258e0 100644 --- a/.github/workflows/netlify.yml +++ b/.github/workflows/netlify.yml @@ -27,7 +27,7 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} fetch-depth: 0 - - uses: pnpm/action-setup@2 + - uses: pnpm/action-setup@v2 - uses: actions/setup-node@v2 with: node-version: '16' From c72067f293f85af6e21252cc4ad119004355fd10 Mon Sep 17 00:00:00 2001 From: Jack Works Date: Fri, 25 Feb 2022 14:54:29 +0800 Subject: [PATCH 7/7] fix: build --- .github/workflows/compile.yml | 2 +- .github/workflows/deploy-proxy.yml | 2 +- .github/workflows/linters.yml | 6 +++--- .github/workflows/netlify.yml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml index ec4107b545e5..4fe43c6783ed 100644 --- a/.github/workflows/compile.yml +++ b/.github/workflows/compile.yml @@ -28,7 +28,7 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} fetch-depth: 0 - - uses: pnpm/action-setup@v2 + - uses: pnpm/action-setup@v2.2.1 - uses: actions/setup-node@v2 with: node-version: '16' diff --git a/.github/workflows/deploy-proxy.yml b/.github/workflows/deploy-proxy.yml index fee14bf6403e..9771c3681ce2 100644 --- a/.github/workflows/deploy-proxy.yml +++ b/.github/workflows/deploy-proxy.yml @@ -17,7 +17,7 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} fetch-depth: 0 - - uses: pnpm/action-setup@v2 + - uses: pnpm/action-setup@v2.2.1 - uses: actions/setup-node@v2 with: cache: pnpm diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml index 4740d3013d79..fbff2b9bc44c 100644 --- a/.github/workflows/linters.yml +++ b/.github/workflows/linters.yml @@ -52,7 +52,7 @@ jobs: - uses: actions/checkout@v2 with: ref: ${{ github.event.pull_request.head.sha }} - - uses: pnpm/action-setup@v2 + - uses: pnpm/action-setup@v2.2.1 - uses: actions/setup-node@v2 with: node-version: "16" @@ -69,7 +69,7 @@ jobs: - uses: actions/checkout@v2 with: ref: ${{ github.event.pull_request.head.sha }} - - uses: pnpm/action-setup@v2 + - uses: pnpm/action-setup@v2.2.1 - uses: actions/setup-node@v2 with: node-version: "16" @@ -84,7 +84,7 @@ jobs: - uses: actions/checkout@v2 with: ref: ${{ github.event.pull_request.head.sha }} - - uses: pnpm/action-setup@v2 + - uses: pnpm/action-setup@v2.2.1 - uses: actions/setup-node@v2 with: node-version: "16" diff --git a/.github/workflows/netlify.yml b/.github/workflows/netlify.yml index 00b52d2258e0..f044a9dbd179 100644 --- a/.github/workflows/netlify.yml +++ b/.github/workflows/netlify.yml @@ -27,7 +27,7 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} fetch-depth: 0 - - uses: pnpm/action-setup@v2 + - uses: pnpm/action-setup@v2.2.1 - uses: actions/setup-node@v2 with: node-version: '16'