Merge branch 'main' into main
This commit is contained in:
commit
f250cda645
5 changed files with 35 additions and 34 deletions
42
.github/workflows/meta.yml
vendored
42
.github/workflows/meta.yml
vendored
|
@ -11,28 +11,28 @@ 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
|
||||||
|
|
||||||
- name: Update metainfo
|
- name: Update metainfo
|
||||||
run: pnpm updateMeta
|
run: pnpm updateMeta
|
||||||
|
|
||||||
- name: Commit and merge in changes
|
- name: Commit and merge in changes
|
||||||
run: |
|
run: |
|
||||||
git config user.name "github-actions[bot]"
|
git config user.name "github-actions[bot]"
|
||||||
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
|
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
|
||||||
git checkout -b ci/meta-update
|
git checkout -b ci/meta-update
|
||||||
git add meta/dev.vencord.Vesktop.metainfo.xml
|
git add meta/dev.vencord.Vesktop.metainfo.xml
|
||||||
git commit -m "Insert release changes for ${{ github.event.release.tag_name }}"
|
git commit -m "Insert release changes for ${{ github.event.release.tag_name }}"
|
||||||
git push origin ci/meta-update
|
git push origin ci/meta-update
|
||||||
gh pr create -B main -H ci/meta-update -t "Metainfo for ${{ github.event.release.tag_name }}" -b "This PR updates the metainfo for release ${{ github.event.release.tag_name }}. @lewisakura @Vendicated"
|
gh pr create -B main -H ci/meta-update -t "Metainfo for ${{ github.event.release.tag_name }}" -b "This PR updates the metainfo for release ${{ github.event.release.tag_name }}. @lewisakura @Vendicated"
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|
12
.github/workflows/release.yml
vendored
12
.github/workflows/release.yml
vendored
|
@ -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
|
||||||
|
@ -43,7 +43,7 @@ jobs:
|
||||||
pnpm electron-builder --${{ matrix.platform }} --publish always
|
pnpm electron-builder --${{ matrix.platform }} --publish always
|
||||||
env:
|
env:
|
||||||
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|
||||||
- name: Run Electron Builder
|
- name: Run Electron Builder
|
||||||
if: ${{ matrix.platform == 'mac' }}
|
if: ${{ matrix.platform == 'mac' }}
|
||||||
run: |
|
run: |
|
||||||
|
|
10
.github/workflows/test.yml
vendored
10
.github/workflows/test.yml
vendored
|
@ -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
|
||||||
|
|
|
@ -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>
|
||||||
|
@ -208,4 +208,4 @@
|
||||||
<keyword>Privacy</keyword>
|
<keyword>Privacy</keyword>
|
||||||
<keyword>Mod</keyword>
|
<keyword>Mod</keyword>
|
||||||
</keywords>
|
</keywords>
|
||||||
</component>
|
</component>
|
||||||
|
|
|
@ -65,6 +65,7 @@
|
||||||
"productName": "Vesktop",
|
"productName": "Vesktop",
|
||||||
"files": [
|
"files": [
|
||||||
"!*",
|
"!*",
|
||||||
|
"!node_modules",
|
||||||
"dist/js",
|
"dist/js",
|
||||||
"static",
|
"static",
|
||||||
"package.json",
|
"package.json",
|
||||||
|
|
Reference in a new issue