diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 0c540d3..9c8d99a 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -12,16 +12,18 @@ jobs: runs-on: ubuntu-latest steps: + - uses: actions/setup-node@v3 + with: + node-version: '18' + - name: Checkout code uses: actions/checkout@v2 - - uses: pnpm/action-setup@v2 # Install pnpm using packageManager key in package.json + - name: Install bash + run: sudo apt install -y bash - - name: Use Node.js 18 - uses: actions/setup-node@v2 - with: - node-version: 18 - cache: "pnpm" + - name: Install pnpm + run: npm i -g pnpm && /bin/bash pnpm setup - name: Install Node dependencies run: pnpm install -g cargo-cp-artifact && pnpm install @@ -50,16 +52,15 @@ jobs: runs-on: macos-latest steps: + - uses: actions/setup-node@v3 + with: + node-version: '18' + - name: Checkout code uses: actions/checkout@v2 - - 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 pnpm + run: npm i -g pnpm && pnpm setup && source /Users/runner/.bashrc - name: Install Node dependencies run: pnpm install -g cargo-cp-artifact && pnpm install @@ -85,22 +86,21 @@ jobs: runs-on: windows-latest steps: + - uses: actions/setup-node@v3 + with: + node-version: '18' + - name: Checkout code uses: actions/checkout@v2 - - 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 pnpm + run: npm i -g pnpm && pnpm setup && powershell - name: Install Node dependencies - run: pnpm install -g cargo-cp-artifact && pnpm install + run: pnpm install - name: Install Electron-Builder - run: pnpm install -g electron-builder + run: pnpm install -g cargo-cp-artifact && pnpm install - name: Replace the version number run: (Get-Content src/utils.ts) -replace "\d\.\d\.\d", "DEV" | Out-File src/utils.ts diff --git a/package.json b/package.json index 8ddec2f..229954d 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "typescript": "^4.7.3" }, "dependencies": { - "@pyke/vibe": "^0.3.1", + "@pyke/vibe": "^0.3.0", "electron-context-menu": "github:ArmCord/electron-context-menu", "os-locale": "^6.0.2", "v8-compile-cache": "^2.3.0", @@ -72,6 +72,5 @@ "AppImage" ] } - }, - "packageManager": "pnpm@7.13.4" + } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1c83e3e..83fde36 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,7 +1,7 @@ lockfileVersion: 5.4 specifiers: - '@pyke/vibe': ^0.3.1 + '@pyke/vibe': ^0.3.0 '@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.1_electron@20.3.1 + '@pyke/vibe': 0.3.0_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.1_electron@20.3.1: - resolution: {integrity: sha512-qgYtiN3cjJUdzBPHYXHILLiug//g1QXw7jLtDCi6HqCPxeIcn8zMslGlAAwS5i9e14UrHaSTUWkLEFEhWidfeQ==} + /@pyke/vibe/0.3.0_electron@20.3.1: + resolution: {integrity: sha512-BuW7szBpTcrVppRufv3fJ9jMyrTculBUG2xWuc5BKOIEZc3I47Bc3CV4+/7Eycj86Exdxi+ZYGNZC6C8XrfIFg==} + os: [win32] requiresBuild: true peerDependencies: electron: '>=11.0' dependencies: - cargo-cp-artifact: 0.1.6 electron: 20.3.1 dev: false @@ -506,11 +506,6 @@ 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}