mirror of
https://github.com/smartfrigde/armcord.git
synced 2024-08-14 23:56:58 +00:00
Compare commits
5 commits
ce83747af7
...
0c6e7f2a9a
Author | SHA1 | Date | |
---|---|---|---|
|
0c6e7f2a9a | ||
|
537ddaf758 | ||
|
80cbc82d09 | ||
|
636bd8264c | ||
|
320326edfe |
3 changed files with 35 additions and 29 deletions
44
.github/workflows/dev.yml
vendored
44
.github/workflows/dev.yml
vendored
|
@ -12,18 +12,16 @@ jobs:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/setup-node@v3
|
|
||||||
with:
|
|
||||||
node-version: '18'
|
|
||||||
|
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v2
|
||||||
|
|
||||||
- name: Install bash
|
- uses: pnpm/action-setup@v2 # Install pnpm using packageManager key in package.json
|
||||||
run: sudo apt install -y bash
|
|
||||||
|
|
||||||
- name: Install pnpm
|
- name: Use Node.js 18
|
||||||
run: npm i -g pnpm && /bin/bash pnpm setup
|
uses: actions/setup-node@v2
|
||||||
|
with:
|
||||||
|
node-version: 18
|
||||||
|
cache: "pnpm"
|
||||||
|
|
||||||
- name: Install Node dependencies
|
- name: Install Node dependencies
|
||||||
run: pnpm install -g cargo-cp-artifact && pnpm install
|
run: pnpm install -g cargo-cp-artifact && pnpm install
|
||||||
|
@ -52,15 +50,16 @@ jobs:
|
||||||
runs-on: macos-latest
|
runs-on: macos-latest
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/setup-node@v3
|
|
||||||
with:
|
|
||||||
node-version: '18'
|
|
||||||
|
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v2
|
||||||
|
|
||||||
- name: Install pnpm
|
- uses: pnpm/action-setup@v2 # Install pnpm using packageManager key in package.json
|
||||||
run: npm i -g pnpm && pnpm setup && source /Users/runner/.bashrc
|
|
||||||
|
- name: Use Node.js 18
|
||||||
|
uses: actions/setup-node@v2
|
||||||
|
with:
|
||||||
|
node-version: 18
|
||||||
|
cache: "pnpm"
|
||||||
|
|
||||||
- name: Install Node dependencies
|
- name: Install Node dependencies
|
||||||
run: pnpm install -g cargo-cp-artifact && pnpm install
|
run: pnpm install -g cargo-cp-artifact && pnpm install
|
||||||
|
@ -86,21 +85,22 @@ jobs:
|
||||||
runs-on: windows-latest
|
runs-on: windows-latest
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/setup-node@v3
|
|
||||||
with:
|
|
||||||
node-version: '18'
|
|
||||||
|
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v2
|
||||||
|
|
||||||
- name: Install pnpm
|
- uses: pnpm/action-setup@v2 # Install pnpm using packageManager key in package.json
|
||||||
run: npm i -g pnpm && pnpm setup && powershell
|
|
||||||
|
- name: Use Node.js 18
|
||||||
|
uses: actions/setup-node@v2
|
||||||
|
with:
|
||||||
|
node-version: 18
|
||||||
|
cache: "pnpm"
|
||||||
|
|
||||||
- name: Install Node dependencies
|
- name: Install Node dependencies
|
||||||
run: pnpm install
|
run: pnpm install -g cargo-cp-artifact && pnpm install
|
||||||
|
|
||||||
- name: Install Electron-Builder
|
- name: Install Electron-Builder
|
||||||
run: pnpm install -g cargo-cp-artifact && pnpm install
|
run: pnpm install -g electron-builder
|
||||||
|
|
||||||
- name: Replace the version number
|
- name: Replace the version number
|
||||||
run: (Get-Content src/utils.ts) -replace "\d\.\d\.\d", "DEV" | Out-File src/utils.ts
|
run: (Get-Content src/utils.ts) -replace "\d\.\d\.\d", "DEV" | Out-File src/utils.ts
|
||||||
|
|
|
@ -38,7 +38,7 @@
|
||||||
"typescript": "^4.7.3"
|
"typescript": "^4.7.3"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@pyke/vibe": "^0.3.0",
|
"@pyke/vibe": "^0.3.1",
|
||||||
"electron-context-menu": "github:ArmCord/electron-context-menu",
|
"electron-context-menu": "github:ArmCord/electron-context-menu",
|
||||||
"os-locale": "^6.0.2",
|
"os-locale": "^6.0.2",
|
||||||
"v8-compile-cache": "^2.3.0",
|
"v8-compile-cache": "^2.3.0",
|
||||||
|
@ -72,5 +72,6 @@
|
||||||
"AppImage"
|
"AppImage"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
},
|
||||||
|
"packageManager": "pnpm@7.13.4"
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
lockfileVersion: 5.4
|
lockfileVersion: 5.4
|
||||||
|
|
||||||
specifiers:
|
specifiers:
|
||||||
'@pyke/vibe': ^0.3.0
|
'@pyke/vibe': ^0.3.1
|
||||||
'@types/node': ^17.0.42
|
'@types/node': ^17.0.42
|
||||||
'@types/ws': ^8.5.3
|
'@types/ws': ^8.5.3
|
||||||
chalk-cli: ^5.0.0
|
chalk-cli: ^5.0.0
|
||||||
|
@ -17,7 +17,7 @@ specifiers:
|
||||||
ws: ^8.8.0
|
ws: ^8.8.0
|
||||||
|
|
||||||
dependencies:
|
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
|
electron-context-menu: github.com/ArmCord/electron-context-menu/280c81398c02a063f46e3285a9708d8db1a7ce32
|
||||||
os-locale: 6.0.2
|
os-locale: 6.0.2
|
||||||
v8-compile-cache: 2.3.0
|
v8-compile-cache: 2.3.0
|
||||||
|
@ -120,13 +120,13 @@ packages:
|
||||||
- supports-color
|
- supports-color
|
||||||
dev: true
|
dev: true
|
||||||
|
|
||||||
/@pyke/vibe/0.3.0_electron@20.3.1:
|
/@pyke/vibe/0.3.1_electron@20.3.1:
|
||||||
resolution: {integrity: sha512-BuW7szBpTcrVppRufv3fJ9jMyrTculBUG2xWuc5BKOIEZc3I47Bc3CV4+/7Eycj86Exdxi+ZYGNZC6C8XrfIFg==}
|
resolution: {integrity: sha512-qgYtiN3cjJUdzBPHYXHILLiug//g1QXw7jLtDCi6HqCPxeIcn8zMslGlAAwS5i9e14UrHaSTUWkLEFEhWidfeQ==}
|
||||||
os: [win32]
|
|
||||||
requiresBuild: true
|
requiresBuild: true
|
||||||
peerDependencies:
|
peerDependencies:
|
||||||
electron: '>=11.0'
|
electron: '>=11.0'
|
||||||
dependencies:
|
dependencies:
|
||||||
|
cargo-cp-artifact: 0.1.6
|
||||||
electron: 20.3.1
|
electron: 20.3.1
|
||||||
dev: false
|
dev: false
|
||||||
|
|
||||||
|
@ -506,6 +506,11 @@ packages:
|
||||||
engines: {node: '>=10'}
|
engines: {node: '>=10'}
|
||||||
dev: true
|
dev: true
|
||||||
|
|
||||||
|
/cargo-cp-artifact/0.1.6:
|
||||||
|
resolution: {integrity: sha512-CQw0doK/aaF7j041666XzuilHxqMxaKkn+I5vmBsd8SAwS0cO5CqVEVp0xJwOKstyqWZ6WK4Ww3O6p26x/Goyg==}
|
||||||
|
hasBin: true
|
||||||
|
dev: false
|
||||||
|
|
||||||
/chalk-cli/5.0.0:
|
/chalk-cli/5.0.0:
|
||||||
resolution: {integrity: sha512-b0TQHOxLsDYV1u00VLsQU+LHxvn7zHpF3YBdbDq6sCfMFEckE0dySV6i8V4U8m2X+aKRX+olpUv424Cq1WcCRQ==}
|
resolution: {integrity: sha512-b0TQHOxLsDYV1u00VLsQU+LHxvn7zHpF3YBdbDq6sCfMFEckE0dySV6i8V4U8m2X+aKRX+olpUv424Cq1WcCRQ==}
|
||||||
engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
|
engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
|
||||||
|
|
Loading…
Reference in a new issue