Merge branch 'main' into main

This commit is contained in:
vee 2024-07-04 18:03:06 +02:00 committed by GitHub
commit bd08e185f3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 50 additions and 38 deletions

View file

@ -11,13 +11,13 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- uses: pnpm/action-setup@v2 # Install pnpm using packageManager key in package.json - uses: pnpm/action-setup@v4 # Install pnpm using packageManager key in package.json
- name: Use Node.js 18.18.2 - name: Use Node.js 20
uses: actions/setup-node@v3 uses: actions/setup-node@v4
with: with:
node-version: 18.18.2 node-version: 20
- name: Install dependencies - name: Install dependencies
run: pnpm i run: pnpm i

View file

@ -22,13 +22,13 @@ jobs:
platform: windows platform: windows
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- uses: pnpm/action-setup@v2 # Install pnpm using packageManager key in package.json - uses: pnpm/action-setup@v4 # Install pnpm using packageManager key in package.json
- name: Use Node.js 18.18.2 - name: Use Node.js 20
uses: actions/setup-node@v3 uses: actions/setup-node@v4
with: with:
node-version: 18.18.2 node-version: 20
cache: "pnpm" cache: "pnpm"
- name: Install dependencies - name: Install dependencies

View file

@ -11,13 +11,13 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- uses: pnpm/action-setup@v2 # Install pnpm using packageManager key in package.json - uses: pnpm/action-setup@v4 # Install pnpm using packageManager key in package.json
- name: Use Node.js 18.18.2 - name: Use Node.js 20
uses: actions/setup-node@v3 uses: actions/setup-node@v4
with: with:
node-version: 18.18.2 node-version: 20
cache: "pnpm" cache: "pnpm"
- name: Install dependencies - name: Install dependencies

View file

@ -182,7 +182,7 @@
<url type="vcs-browser">https://github.com/Vencord/Vesktop</url> <url type="vcs-browser">https://github.com/Vencord/Vesktop</url>
<categories> <categories>
<category>InstantMessaging</category> <category>InstantMessaging</category>
<category>AudioVideo</category> <category>Network</category>
</categories> </categories>
<requires> <requires>
<control>pointing</control> <control>pointing</control>

View file

@ -65,6 +65,7 @@
"productName": "Vesktop", "productName": "Vesktop",
"files": [ "files": [
"!*", "!*",
"!node_modules",
"dist/js", "dist/js",
"static", "static",
"package.json", "package.json",
@ -118,8 +119,7 @@
{ {
"target": "default", "target": "default",
"arch": [ "arch": [
"x64", "universal"
"arm64"
] ]
} }
], ],
@ -158,8 +158,20 @@
}, },
"win": { "win": {
"target": [ "target": [
"nsis", {
"zip" "target": "nsis",
"arch": [
"x64",
"arm64"
]
},
{
"target": "zip",
"arch": [
"x64",
"arm64"
]
}
] ]
}, },
"publish": { "publish": {