From 320326edfeaff46a5eb0852e69327bc8ba77fd4b Mon Sep 17 00:00:00 2001 From: smartfridge <37928912+smartfrigde@users.noreply.github.com> Date: Tue, 11 Oct 2022 20:45:24 +0200 Subject: [PATCH 1/5] Fix pnpm install --- .github/workflows/dev.yml | 40 +++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 9c8d99a..c01a839 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -12,18 +12,16 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/setup-node@v3 - with: - node-version: '18' - - name: Checkout code uses: actions/checkout@v2 - - name: Install bash - run: sudo apt install -y bash + - uses: pnpm/action-setup@v2 # Install pnpm using packageManager key in package.json - - name: Install pnpm - run: npm i -g pnpm && /bin/bash pnpm setup + - name: Use Node.js 18 + uses: actions/setup-node@v2 + with: + node-version: 18 + cache: "pnpm" - name: Install Node dependencies run: pnpm install -g cargo-cp-artifact && pnpm install @@ -52,15 +50,16 @@ jobs: runs-on: macos-latest steps: - - uses: actions/setup-node@v3 - with: - node-version: '18' - - name: Checkout code uses: actions/checkout@v2 - - name: Install pnpm - run: npm i -g pnpm && pnpm setup && source /Users/runner/.bashrc + - uses: pnpm/action-setup@v2 # Install pnpm using packageManager key in package.json + + - name: Use Node.js 18 + uses: actions/setup-node@v2 + with: + node-version: 18 + cache: "pnpm" - name: Install Node dependencies run: pnpm install -g cargo-cp-artifact && pnpm install @@ -86,15 +85,16 @@ jobs: runs-on: windows-latest steps: - - uses: actions/setup-node@v3 - with: - node-version: '18' - - name: Checkout code uses: actions/checkout@v2 - - name: Install pnpm - run: npm i -g pnpm && pnpm setup && powershell + - uses: pnpm/action-setup@v2 # Install pnpm using packageManager key in package.json + + - name: Use Node.js 18 + uses: actions/setup-node@v2 + with: + node-version: 18 + cache: "pnpm" - name: Install Node dependencies run: pnpm install From 636bd8264c6e0b4ca2f72a7a01f769a96d6c86e0 Mon Sep 17 00:00:00 2001 From: smartfridge <37928912+smartfrigde@users.noreply.github.com> Date: Tue, 11 Oct 2022 20:50:41 +0200 Subject: [PATCH 2/5] Specify pnpm version --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 229954d..a653849 100644 --- a/package.json +++ b/package.json @@ -72,5 +72,6 @@ "AppImage" ] } - } + }, + "packageManager": "pnpm@7.13.4" } From 80cbc82d093405be4f329e6491af5780723ca07f Mon Sep 17 00:00:00 2001 From: smartfridge <37928912+smartfrigde@users.noreply.github.com> Date: Tue, 11 Oct 2022 20:58:13 +0200 Subject: [PATCH 3/5] Fix Windows build script --- .github/workflows/dev.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index c01a839..0c540d3 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -97,10 +97,10 @@ jobs: cache: "pnpm" - name: Install Node dependencies - run: pnpm install + run: pnpm install -g cargo-cp-artifact && pnpm install - name: Install Electron-Builder - run: pnpm install -g cargo-cp-artifact && pnpm install + run: pnpm install -g electron-builder - name: Replace the version number run: (Get-Content src/utils.ts) -replace "\d\.\d\.\d", "DEV" | Out-File src/utils.ts From 537ddaf758fe9e768aec01a1e67ee3b9d3054839 Mon Sep 17 00:00:00 2001 From: smartfridge <37928912+smartfrigde@users.noreply.github.com> Date: Tue, 11 Oct 2022 21:05:20 +0200 Subject: [PATCH 4/5] Update Vibe --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a653849..8ddec2f 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "typescript": "^4.7.3" }, "dependencies": { - "@pyke/vibe": "^0.3.0", + "@pyke/vibe": "^0.3.1", "electron-context-menu": "github:ArmCord/electron-context-menu", "os-locale": "^6.0.2", "v8-compile-cache": "^2.3.0", From 0c6e7f2a9a411d184d5968d7bdf77dbad517b57c Mon Sep 17 00:00:00 2001 From: smartfridge <37928912+smartfrigde@users.noreply.github.com> Date: Tue, 11 Oct 2022 21:10:15 +0200 Subject: [PATCH 5/5] update lock --- pnpm-lock.yaml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 83fde36..1c83e3e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,7 +1,7 @@ lockfileVersion: 5.4 specifiers: - '@pyke/vibe': ^0.3.0 + '@pyke/vibe': ^0.3.1 '@types/node': ^17.0.42 '@types/ws': ^8.5.3 chalk-cli: ^5.0.0 @@ -17,7 +17,7 @@ specifiers: ws: ^8.8.0 dependencies: - '@pyke/vibe': 0.3.0_electron@20.3.1 + '@pyke/vibe': 0.3.1_electron@20.3.1 electron-context-menu: github.com/ArmCord/electron-context-menu/280c81398c02a063f46e3285a9708d8db1a7ce32 os-locale: 6.0.2 v8-compile-cache: 2.3.0 @@ -120,13 +120,13 @@ packages: - supports-color dev: true - /@pyke/vibe/0.3.0_electron@20.3.1: - resolution: {integrity: sha512-BuW7szBpTcrVppRufv3fJ9jMyrTculBUG2xWuc5BKOIEZc3I47Bc3CV4+/7Eycj86Exdxi+ZYGNZC6C8XrfIFg==} - os: [win32] + /@pyke/vibe/0.3.1_electron@20.3.1: + resolution: {integrity: sha512-qgYtiN3cjJUdzBPHYXHILLiug//g1QXw7jLtDCi6HqCPxeIcn8zMslGlAAwS5i9e14UrHaSTUWkLEFEhWidfeQ==} requiresBuild: true peerDependencies: electron: '>=11.0' dependencies: + cargo-cp-artifact: 0.1.6 electron: 20.3.1 dev: false @@ -506,6 +506,11 @@ packages: engines: {node: '>=10'} dev: true + /cargo-cp-artifact/0.1.6: + resolution: {integrity: sha512-CQw0doK/aaF7j041666XzuilHxqMxaKkn+I5vmBsd8SAwS0cO5CqVEVp0xJwOKstyqWZ6WK4Ww3O6p26x/Goyg==} + hasBin: true + dev: false + /chalk-cli/5.0.0: resolution: {integrity: sha512-b0TQHOxLsDYV1u00VLsQU+LHxvn7zHpF3YBdbDq6sCfMFEckE0dySV6i8V4U8m2X+aKRX+olpUv424Cq1WcCRQ==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}